This is an automated email from the ASF dual-hosted git repository.
algairim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new f4b2237e Add recursive checkbox to logbook params
new 828973f0 Merge pull request #324 from
grkvlt/update/logbook-recursive-task-id-query
f4b2237e is described below
commit f4b2237e08cdbac4e23e2fd027d9e84cf9b05174
Author: Andrew Donald Kennedy <[email protected]>
AuthorDate: Fri May 13 09:57:10 2022 +0100
Add recursive checkbox to logbook params
Signed-off-by: Andrew Donald Kennedy <[email protected]>
---
ui-modules/utils/logbook/logbook.js | 2 ++
ui-modules/utils/logbook/logbook.template.html | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/ui-modules/utils/logbook/logbook.js
b/ui-modules/utils/logbook/logbook.js
index b0c2b8af..b9a14067 100644
--- a/ui-modules/utils/logbook/logbook.js
+++ b/ui-modules/utils/logbook/logbook.js
@@ -82,6 +82,7 @@ export function logbook() {
{name: 'Debug', value: 'DEBUG', selected: true},
],
latest: true,
+ recursive: false,
dateTimeFrom: null,
dateTimeTo: null,
numberOfItems: 1000,
@@ -234,6 +235,7 @@ export function logbook() {
const params = {
levels: levels,
tail: $scope.search.latest,
+ recursive: $scope.search.recursive,
searchPhrase: $scope.search.phrase,
taskId: $scope.taskId,
entityId: $scope.entityId,
diff --git a/ui-modules/utils/logbook/logbook.template.html
b/ui-modules/utils/logbook/logbook.template.html
index 7c7244b0..7d911a35 100644
--- a/ui-modules/utils/logbook/logbook.template.html
+++ b/ui-modules/utils/logbook/logbook.template.html
@@ -59,6 +59,11 @@
<i class="fa fa-share" ng-class="{'fa-rotate-90':
search.latest, 'fa-rotate-270': !search.latest}"></i>
</button>
</div>
+ <div class="btn-group">
+ <button id="logbook-recursive" type="button"
ng-click="search.recursive = !search.recursive" class="btn btn-default
btn-accent" uib-dropdown-toggle uib-tooltip="Recursive selection of task
children">
+ <i class="fa fa-share" ng-class="{'fa-rotate-90':
search.latest, 'fa-rotate-270': !search.recursive}"></i>
+ </button>
+ </div>
<div class="btn-group" uib-dropdown
auto-close="outsideClick">
<button id="logbook-filters" type="button" class="btn
btn-default btn-accent" uib-dropdown-toggle uib-tooltip="Toggle log filters">
<i class="fa fa-filter"></i>
