Service Contactgroup: Fixed livestatus exception
Message-ID: <54295647.NzOXiRQ7YENjocpn%ab(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: 2df93d322ed472713031813e9ebb3931741d8bf8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2df93d322ed472…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Sep 29 14:53:13 2014 +0200
#1120 FIX Multisite filters Host/Service Contactgroup: Fixed livestatus exception
The multisite filters <tt>Host Contactgroups</tt> and <tt>Service
Contactgroups</tt> were
not working because of an incorrect livestatus filter formatting.
This resulted in an livestatus exception every time any of these filters were actively
used.
---
.werks/1120 | 12 ++++++++++++
ChangeLog | 1 +
web/plugins/views/filters.py | 6 ++++--
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/.werks/1120 b/.werks/1120
new file mode 100644
index 0000000..eac58f7
--- /dev/null
+++ b/.werks/1120
@@ -0,0 +1,12 @@
+Title: Multisite filters Host/Service Contactgroup: Fixed livestatus exception
+Level: 2
+Component: multisite
+Compatible: compat
+Version: 1.2.5i6
+Date: 1411994905
+Class: fix
+
+The multisite filters <tt>Host Contactgroups</tt> and <tt>Service
Contactgroups</tt> were
+not working because of an incorrect livestatus filter formatting.
+This resulted in an livestatus exception every time any of these filters were actively
used.
+
diff --git a/ChangeLog b/ChangeLog
index 4795829..60164b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,6 +110,7 @@
* 1094 FIX: sidebar snaping 'Tree of folders': fixed exception
* 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after
editing availability options...
* 1401 FIX: Display options in views are now again persistent...
+ * 1120 FIX: Multisite filters Host/Service Contactgroup: Fixed livestatus
exception...
WATO:
* 1096 New WATO webservices: manage hosts via webinterface...
diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py
index 40cc08b..d764df4 100644
--- a/web/plugins/views/filters.py
+++ b/web/plugins/views/filters.py
@@ -214,7 +214,8 @@ class FilterGroupCombo(Filter):
if not self.enforce:
return ""
# Take first group with the name we search
- current_value = html.live.query_value("GET %sgroups\nCache:
reload\nColumns: name\nLimit: 1\n" % self.what, None)
+ table = self.what.replace("host_contact",
"contact").replace("service_contact", "contact")
+ current_value = html.live.query_value("GET %sgroups\nCache:
reload\nColumns: name\nLimit: 1\n" % table, None)
if current_value == None:
return "" # no {what}group exists!
@@ -242,8 +243,9 @@ class FilterGroupCombo(Filter):
def heading_info(self, infoname):
current_value = self.current_value(infoname)
if current_value:
+ table = self.what.replace("host_contact",
"contact").replace("service_contact", "contact")
alias = html.live.query_value("GET %sgroups\nCache: reload\nColumns:
alias\nFilter: name = %s\n" %
- (self.what, current_value), current_value)
+ (table, current_value), current_value)
return alias