[checkmk-commits] 5565 FIX WATO rules: Breadcrumb navigation is now consistent with rule search

Module: check_mk Branch: master Commit: 4a753d0ef2e9ca379b46352dca39bcc5a9e9d5ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a753d0ef2e9ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 4 11:37:47 2017 +0100 5565 FIX WATO rules: Breadcrumb navigation is now consistent with rule search The interaction of the rule search and the folder breadcrumb was not working correctly. The breadcrumb navigation is now updating the search filters, just like it's done for the quick search filter. Change-Id: I2b52d08fde1650c65998ae5beafd845ff657caa5 --- .werks/5565 | 12 ++++++++++++ web/htdocs/wato.py | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/5565 b/.werks/5565 new file mode 100644 index 0000000..70bf82a --- /dev/null +++ b/.werks/5565 @@ -0,0 +1,12 @@ +Title: WATO rules: Breadcrumb navigation is now consistent with rule search +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512383794 +Class: fix + +The interaction of the rule search and the folder breadcrumb was not working +correctly. The breadcrumb navigation is now updating the search filters, just +like it's done for the quick search filter. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index abcd1f7..3649b90 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12668,6 +12668,12 @@ class ModeRulesets(WatoMode): html.set_var("search_p_fulltext_USE", "on") html.del_var("search") + # Transform the folder argumen (from URL or bradcrumb) to the "rule search arguments + if html.var("folder"): + html.set_var("search_p_rule_folder_0", DropdownChoice.option_id(html.var("folder"))) + html.set_var("search_p_rule_folder_1", DropdownChoice.option_id(True)) + html.set_var("search_p_rule_folder_USE", "on") + self._search_options = ModeRuleSearch().search_options self._only_host = html.var("host") @@ -13009,7 +13015,7 @@ class ModeEditRuleset(WatoMode): def page(self): if not self._hostname: - watolib.Folder.current().show_breadcrump(keepvarnames = ["mode", "varname"]) + watolib.Folder.current().show_breadcrump(keepvarnames=True) # = ["mode", "varname"]) if not config.wato_hide_varnames: display_varname = '%s["%s"]' % tuple(self._name.split(":")) \