[checkmk-commits] Fixed rule condition rendering after reccent HTML rewriting

Module: check_mk Branch: master Commit: afd8e9c26590cb783d949127cd92cc5e2afcc1b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afd8e9c26590cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 09:29:08 2016 +0100 Fixed rule condition rendering after reccent HTML rewriting Change-Id: I1e12769a5d052867fe5843d3705d4ff3af49dea9 --- web/htdocs/wato.py | 4 ++-- web/htdocs/watolib.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 87b13f5..181110e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12629,7 +12629,7 @@ class ModeEditRuleset(WatoMode): if len(text_list) == 1: condition += text_list[0] else: - condition += ", ".join(text_list[:-1]) + condition += ", ".join([ "%s" % s for s in text_list[:-1] ]) condition += _(" or ") + text_list[-1] # Other cases should not occur, e.g. list of explicit hosts @@ -12678,7 +12678,7 @@ class ModeEditRuleset(WatoMode): if len(text_list) == 1: condition += text_list[0] else: - condition += ", ".join(text_list[:-1]) + condition += ", ".join([ "%s" % s for s in text_list[:-1] ]) condition += _(" or ") + text_list[-1] if condition: diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 728e23f..205b8d5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6756,7 +6756,7 @@ class Rule(object): + (self.item_list or []) if self.ruleset.valuespec(): - to_search.append(self.ruleset.valuespec().value_to_text(self.value)) + to_search.append("%s" % self.ruleset.valuespec().value_to_text(self.value)) if not match_one_of_search_expression(search_options, "fulltext", to_search): return False