[checkmk-commits] Check_MK Git: check_mk: #1760 Added search form to manual checks page

Module: check_mk Branch: master Commit: cdbca2fdb80a765fddb8829415c877732a1f9380 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdbca2fdb80a76… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Dec 11 16:15:10 2014 +0100 #1760 Added search form to manual checks page --- .werks/1760 | 10 ++++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 31 ++++++++++--------------------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.werks/1760 b/.werks/1760 new file mode 100644 index 0000000..74fde3b --- /dev/null +++ b/.werks/1760 @@ -0,0 +1,10 @@ +Title: Added search form to manual checks page +Level: 1 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418310884 + + diff --git a/ChangeLog b/ChangeLog index 556b3a4..cb915b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... + WATO: + * 1760 Added search form to manual checks page + 1.2.6b1: Core & Setup: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8c9df09..4f4010b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7452,16 +7452,7 @@ def render_global_configuration_variables(default_values, current_settings, show groupnames = g_configvar_groups.keys() groupnames.sort() - html.begin_form("search") - html.write(_("Search for settings: ")) - html.text_input("search", size=32) - html.hidden_fields() - html.hidden_field("mode", "globalvars") - html.set_focus("search") - html.write(" ") - html.button("_do_seach", _("Search")) - html.end_form() - html.write('<br>') + search_form(_("Search for settings:")) at_least_one_painted = False html.write('<div class=globalvars>') @@ -13702,23 +13693,21 @@ def mode_ruleeditor(phase): menu.append((url, title, icon, "rulesets", help)) render_main_menu(menu) - html.write("<BR>") - rule_search_form() - - + html.write("<br>") + search_form(_("Search for rules: "), "rulesets") -def rule_search_form(): +def search_form(title, mode=None): html.begin_form("search") - html.write(_("Search for rules: ")) + html.write(title+' ') html.text_input("search", size=32) html.hidden_fields() - html.hidden_field("mode", "rulesets") + if mode: + html.hidden_field("mode", mode) html.set_focus("search") html.write(" ") html.button("_do_seach", _("Search")) html.end_form() - html.write("<br>") - + html.write('<br>') def rule_is_ineffective(rule, rule_folder, rulespec, hosts): value, tag_specs, host_list, item_list, rule_options = parse_rule(rulespec, rule) @@ -13915,8 +13904,8 @@ def mode_rulesets(phase, group=None): if not only_host: render_folder_path(keepvarnames = ["mode", "local", "group"]) - if search != None: - rule_search_form() + if search != None or group == 'static': + search_form(_("Search for rules: "), "rulesets") if help != None: help = "".join(help.split("\n", 1)[1:]).strip()