[checkmk-commits] WATO search: cleaned up duplicate code

Module: check_mk Branch: master Commit: 77ea3362abc94d3bd328821753eea9ceea4c6527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77ea3362abc94d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 10:35:26 2016 +0100 WATO search: cleaned up duplicate code --- web/htdocs/wato.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5868515..0087151 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6139,9 +6139,7 @@ def mode_edit_ldap_connection(phase): # '----------------------------------------------------------------------' def mode_globalvars(phase): - search = html.get_unicode_input("search") - if search != None: - search = search.strip().lower() + search = get_search_expression() if phase == "title": if search: @@ -9037,9 +9035,7 @@ def mode_edit_site_globals(phase): siteid = html.var("site") site = configured_sites[siteid] - search = html.get_unicode_input("search") - if search != None: - search = search.strip().lower() + search = get_search_expression() if phase == "title": return _("Edit site-specific global settings of %s") % siteid @@ -10857,6 +10853,8 @@ def mode_edit_role(phase): add_change("edit-roles", _("Modified user role '%s'") % new_id, sites=get_login_sites()) return "roles" + search_form(_("Search for permissions: "), "permissions") + html.begin_form("role", method="POST") # ID @@ -11943,6 +11941,13 @@ def search_form(title, mode=None): html.br() +def get_search_expression(): + search = html.get_unicode_input("search") + if search != None: + search = search.strip().lower() + return search + + def rule_is_ineffective(rule, rule_folder, rulespec, hosts): value, tag_specs, host_list, item_list, rule_options = parse_rule(rulespec, rule) found_match = False @@ -12060,9 +12065,7 @@ def mode_rulesets(phase, group=None): show_deprecated = html.var("deprecated") == "1" - search = html.get_unicode_input("search") - if search != None: - search = search.strip().lower() + search = get_search_expression() if group == "used": title = _("Used Rulesets")