[checkmk-commits] Fixed WATO ruleset navigation

Module: check_mk Branch: master Commit: f730364456bc497c3db4199c339cde51b6ace22f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f730364456bc49… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 3 15:45:35 2017 +0200 Fixed WATO ruleset navigation Change-Id: I5480809db4677961ff1ccb1083816f1af0dbe2af --- web/htdocs/valuespec.py | 11 ++++++----- web/htdocs/wato.py | 14 +++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 490ed5e..e4386ad 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1624,10 +1624,10 @@ class DropdownChoice(ValueSpec): html.write(self._empty_text) elif len(options[0]) == 3: html.icon_dropdown(varprefix, self._options_for_html(options), - deflt=self._option_id(defval)) + deflt=self.option_id(defval)) else: html.dropdown(varprefix, self._options_for_html(options), - deflt=self._option_id(defval),onchange=self._on_change, sorted=self._sorted) + deflt=self.option_id(defval),onchange=self._on_change, sorted=self._sorted) def _get_invalid_choice_title(self, value): @@ -1664,17 +1664,18 @@ class DropdownChoice(ValueSpec): def _is_selected_option_from_html(self, varprefix, val): selected_value = html.var(varprefix) - return selected_value == self._option_id(val) + return selected_value == self.option_id(val) def _options_for_html(self, orig_options): options = [] for val, title in orig_options: - options.append((self._option_id(val), title)) + options.append((self.option_id(val), title)) return options - def _option_id(self, val): + @classmethod + def option_id(cls, val): return "%s" % hash(val) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 621169a..d4dce5c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12212,19 +12212,19 @@ class ModeRuleEditor(WatoMode): html.context_button(_("Used Rulesets"), folder_preserving_link([ ("mode", "rulesets"), - ("search_p_ruleset_used", "0"), + ("search_p_ruleset_used", DropdownChoice.option_id(True)), ("search_p_ruleset_used_USE", "on"), ]), "usedrulesets") html.context_button(_("Ineffective rules"), folder_preserving_link([ ("mode", "rulesets"), - ("search_p_rule_ineffective", "0"), + ("search_p_rule_ineffective", DropdownChoice.option_id(True)), ("search_p_rule_ineffective_USE", "on")] ), "rulesets_ineffective") html.context_button(_("Deprecated Rulesets"), folder_preserving_link([ ("mode", "rulesets"), - ("search_p_ruleset_deprecated", "0"), + ("search_p_ruleset_deprecated", DropdownChoice.option_id(True)), ("search_p_ruleset_deprecated_USE", "on") ]), "rulesets_deprecated") @@ -12299,12 +12299,8 @@ class ModeRulesets(WatoMode): # Transform group argument to the "rule search arguments" # Keeping this for compatibility reasons for the moment if self._group_name: - try: - group_names = [ g[0] for g in g_rulespecs.get_group_choices(self._mode) ] - rulegroup_index = group_names.index(html.get_unicode_input("group")) - except (ValueError, IndexError): - raise MKUserError(None, _("Unknown ruleset group")) - html.set_var("search_p_ruleset_group", "%d" % rulegroup_index) + html.set_var("search_p_ruleset_group", + DropdownChoice.option_id(html.get_unicode_input("group"))) html.set_var("search_p_ruleset_group_USE", "on") html.del_var("group")