This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 96ac3670f288845044ad20682b16dfdabd3f406c Author: Alex Heneveld <[email protected]> AuthorDate: Thu Jul 27 10:07:48 2023 +0100 make clear for policies that triggers are shown, as well as subtasks --- .../app-inspector/app/components/task-list/task-list.directive.js | 1 + .../app-inspector/app/components/task-list/task-list.template.html | 2 +- .../app/views/main/inspect/management/detail/detail.template.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui-modules/app-inspector/app/components/task-list/task-list.directive.js b/ui-modules/app-inspector/app/components/task-list/task-list.directive.js index d7d273d9..5bd99d00 100644 --- a/ui-modules/app-inspector/app/components/task-list/task-list.directive.js +++ b/ui-modules/app-inspector/app/components/task-list/task-list.directive.js @@ -46,6 +46,7 @@ export function taskListDirective() { search: '<', entityId: '<?', contextKey: '@?', // a key to uniquely identify the calling context to save filter settings + activityColumnTitle: '@?', }, controller: ['$scope', '$element', controller] }; diff --git a/ui-modules/app-inspector/app/components/task-list/task-list.template.html b/ui-modules/app-inspector/app/components/task-list/task-list.template.html index b501ca08..4443fb06 100644 --- a/ui-modules/app-inspector/app/components/task-list/task-list.template.html +++ b/ui-modules/app-inspector/app/components/task-list/task-list.template.html @@ -87,7 +87,7 @@ Status </th> <th> - Activity + {{activityColumnTitle || 'Activity'}} </th> <th> Started diff --git a/ui-modules/app-inspector/app/views/main/inspect/management/detail/detail.template.html b/ui-modules/app-inspector/app/views/main/inspect/management/detail/detail.template.html index 5817c678..2dc1f822 100644 --- a/ui-modules/app-inspector/app/views/main/inspect/management/detail/detail.template.html +++ b/ui-modules/app-inspector/app/views/main/inspect/management/detail/detail.template.html @@ -115,7 +115,7 @@ <div class="row"> <div class="col-md-12"> <loading-state error="vm.error" ng-if="!vm.activities"></loading-state> - <task-list tasks="vm.activities" ng-if="vm.activities" task-type="ALL" entity-id="vm.entityId"></task-list> + <task-list activity-column-title="Activity or Trigger" tasks="vm.activities" ng-if="vm.activities" task-type="ALL" entity-id="vm.entityId"></task-list> </div> <!-- kilt view not shown, as it requires to load activities deep --> </div>
