[checkmk-commits] Fixed WATO ruleset page for some categories (e.g. access to agents)

Module: check_mk Branch: master Commit: 84b03dde9f444c7cf1a2fd806fb77bbcb57f990f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84b03dde9f444c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 13:00:22 2017 +0200 Fixed WATO ruleset page for some categories (e.g. access to agents) Change-Id: Idb873099204cfc7c23581ccb2df81b2e29f6d046 --- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 77d6490..f81de23 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12357,7 +12357,7 @@ class ModeRulesets(WatoMode): # Keeping this for compatibility reasons for the moment if self._group_name: html.set_var("search_p_ruleset_group", - DropdownChoice.option_id(html.var("group"))) + DropdownChoice.option_id(self._group_name)) html.set_var("search_p_ruleset_group_USE", "on") html.del_var("group") diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index eab4cbc..ea9116a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7029,7 +7029,7 @@ class Rulespecs(object): if group_name.startswith(main_group_name + "/"): # TODO: Move this subgroup title calculation to some generic place sub_group_title = group_name.split("/", 1)[1] - choices.append((group_name, u"  ⌙ %s" % sub_group_title)) + choices.append((make_utf8(group_name), u"  ⌙ %s" % sub_group_title)) return choices @@ -7049,7 +7049,7 @@ class Rulespecs(object): group_names = [] for group_name in self._sorted_groups: - main_group = group_name.split('/')[0] + main_group = make_utf8(group_name.split('/')[0]) if main_group not in seen: group_names.append(main_group) seen.add(main_group)