Module: check_mk
Branch: master
Commit: 778cf48d6849ec528c299ad07ae3482c71c1c07a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=778cf48d6849ec…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Wed May 9 13:11:45 2018 +0200
6073 FIX BI Aggregation Group Tree: Fixed missing filter
Change-Id: I4768de80a9b58f22906542c2eddc51d0e400e865
---
.werks/6073 | 10 ++++++++++
web/plugins/sidebar/bi.py | 11 +++++------
web/plugins/views/builtin.py | 1 +
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/.werks/6073 b/.werks/6073
new file mode 100644
index 0000000..2d41aaf
--- /dev/null
+++ b/.werks/6073
@@ -0,0 +1,10 @@
+Title: BI Aggregation Group Tree: Fixed missing filter
+Level: 1
+Component: bi
+Compatible: compat
+Edition: cre
+Version: 1.6.0i1
+Date: 1525864260
+Class: fix
+
+
diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py
index bd53451..8356239 100644
--- a/web/plugins/sidebar/bi.py
+++ b/web/plugins/sidebar/bi.py
@@ -84,19 +84,18 @@ def _build_tree(group, parent, path):
def _render_tree(tree):
for group, attrs in tree.iteritems():
- fetch_url = html.makeuri_contextless([
- ("view_name", "aggr_all"),
- ("aggr_group_tree",
html.urlencode("/".join(attrs["__path__"])))],
- "view.py")
-
if attrs.get('__children__'):
html.begin_foldable_container("bi_aggregation_groups", group,
False,
- HTML(html.render_a(group, href=fetch_url,
+ HTML(html.render_a(group, href=None,
target="main")))
_render_tree(attrs['__children__'])
html.end_foldable_container()
else:
html.open_ul()
+ fetch_url = html.makeuri_contextless([
+ ("view_name", "aggr_all"),
+ ("aggr_group_tree",
html.urlencode("/".join(attrs["__path__"])))],
+ "view.py")
bulletlink(group, fetch_url)
html.close_ul()
diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py
index 9f1536d..097f47f 100644
--- a/web/plugins/views/builtin.py
+++ b/web/plugins/views/builtin.py
@@ -2368,6 +2368,7 @@ multisite_builtin_views.update({
'play_sounds': False,
'public': False,
'show_filters': ['aggr_group',
+ 'aggr_group_tree',
'aggr_hosts',
'aggr_name_regex',
'aggr_state',