[checkmk-commits] Fixed processing of BI aggregations containing umlauts

Module: check_mk Branch: master Commit: c1bb6da00f83d442c632f4e9e280d1910170b9e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1bb6da00f83d4… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Apr 27 11:15:46 2016 +0200 Fixed processing of BI aggregations containing umlauts --- web/htdocs/bi.py | 2 +- web/plugins/visuals/bi.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index dc935d9..546e12b 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -498,7 +498,7 @@ def compile_rule_node(aggr_type, calllist, lvl): if rulename not in config.aggregation_rules: raise MKConfigError(_("<h1>Invalid configuration in variable <tt>aggregations</tt></h1>" "There is no rule named <tt>%s</tt>. Available are: <tt>%s</tt>") % - (rulename, "</tt>, </tt>".join(config.aggregation_rules.keys()))) + (rulename, "</tt>, <tt>".join(config.aggregation_rules.keys()))) rule = config.aggregation_rules[rulename] # Execute FOREACH: iterate over matching hosts/services. diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py index d565093..6bc8cdd 100644 --- a/web/plugins/visuals/bi.py +++ b/web/plugins/visuals/bi.py @@ -39,7 +39,7 @@ class BIGroupFilter(Filter): html.select(htmlvar, [ ("", "") ] + [(g, g) for g in bi.aggregation_groups()]) def selected_group(self): - return html.var(self.htmlvars[0]) + return html.get_unicode_input(self.htmlvars[0]) def filter_table(self, rows): group = self.selected_group() @@ -49,7 +49,7 @@ class BIGroupFilter(Filter): return [ row for row in rows if row[self.column] == group ] def heading_info(self): - return html.var(self.htmlvars[0]) + return html.get_unicode_input(self.htmlvars[0]) declare_filter( 90, BIGroupFilter())