page when no host/service given
Message-ID: <56f017fe.Lt8PRaGSjE3vDNfX%lm(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.5 6/20/10
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: ab72858e857dc232d5cc92b5660a6506e94ec1ec
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab72858e857dc2…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Mar 21 16:49:11 2016 +0100
3339 FIX Fixed exception on "Aggregations Affected by Service" page when no
host/service given
---
.werks/3339 | 10 ++++++++++
ChangeLog | 1 +
web/plugins/visuals/bi.py | 3 ++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/3339 b/.werks/3339
new file mode 100644
index 0000000..8f929ec
--- /dev/null
+++ b/.werks/3339
@@ -0,0 +1,10 @@
+Title: Fixed exception on "Aggregations Affected by Service" page when no
host/service given
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1458575328
+
+
diff --git a/ChangeLog b/ChangeLog
index 208bba8..e817f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -127,6 +127,7 @@
* 3315 FIX: Builtin icon visibility now can be correctly reset...
* 3336 FIX: Fixed possible crash on werk list page...
* 3337 FIX: Improved error handling of invalid perfdata in the GUI
+ * 3339 FIX: Fixed exception on "Aggregations Affected by Service" page when
no host/service given
WATO:
* 3244 WATO BI Module: swap order of aggregation function and child node
selection...
diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py
index b2e5ed0..d565093 100644
--- a/web/plugins/visuals/bi.py
+++ b/web/plugins/visuals/bi.py
@@ -140,7 +140,8 @@ class BIServiceFilter(Filter):
html.text_input(self.htmlvars[2])
def heading_info(self):
- return html.get_unicode_input(self.htmlvars[1]) + " / " +
html.get_unicode_input(self.htmlvars[2])
+ return html.get_unicode_input(self.htmlvars[1], "") \
+ + " / " + html.get_unicode_input(self.htmlvars[2],
"")
def service_spec(self):
if html.has_var(self.htmlvars[2]):