[checkmk-commits] Check_MK Git: check_mk: Bugfix: Fixed doubled var in view editor ( site and siteopt filter)

Module: check_mk Branch: master Commit: e89eadd9a4d3d44018aa9ec4f929e819a92af7ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e89eadd9a4d3d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 6 16:04:40 2012 +0200 Bugfix: Fixed doubled var in view editor (site and siteopt filter) (View-Editor: siteopt und site Filter haben beide das Formularfeld "name". Eines ist eventuell versteckt und setzt einen anderen Wert, als das Feld, was man gerade gewählt hat) --- web/plugins/views/filters.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 4fe3a1b..0cc63b0 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -324,20 +324,20 @@ declare_filter(232, FilterNagiosExpression("service", "in_downtime", class FilterSite(Filter): def __init__(self, name, enforce): - Filter.__init__(self, name, _("Site") + (enforce and _( " (enforced)") or ""), None, ["site"], []) + Filter.__init__(self, name, _("Site") + (enforce and _( " (enforced)") or ""), None, [name], []) self.enforce = enforce def visible(self): return config.is_multisite() def display(self): - site_selector(html, "site", self.enforce) + site_selector(html, self.name, self.enforce) def filter(self, infoname): if config.is_multisite(): - site = html.var("site") + site = html.var(self.name) if site: - return "Sites: %s\n" % (html.var("site", "")) + return "Sites: %s\n" % (html.var(self.name, "")) elif not self.enforce: return "" else: @@ -346,7 +346,7 @@ class FilterSite(Filter): return "" def heading_info(self, infoname): - current_value = html.var("site") + current_value = html.var(self.name) if current_value: alias = config.site(current_value)["alias"] return alias