[checkmk-commits] watolib cleanup: Moved some smaller things

Module: check_mk Branch: master Commit: 3c3a7615abf2c1a2e04bef4d6ee67f27cbb45d6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c3a7615abf2c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 7 21:58:42 2019 +0100 watolib cleanup: Moved some smaller things Change-Id: I751335811c574f161d409c845ea47bf4835d6239 --- cmk/gui/views.py | 18 +++++++++++++++--- cmk/gui/watolib/__init__.py | 15 +++------------ cmk/gui/watolib/utils.py | 1 + 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 75d6aa7..5cfa154 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1566,7 +1566,6 @@ def show_context_links(thisview, datasource, show_filters, enable_commands, enab ## Large buttons if display_options.enabled(display_options.B): - import cmk.gui.watolib as watolib # WATO: If we have a host context, then show button to WATO, if permissions allow this if html.request.has_var("host") \ and config.wato_enabled \ @@ -1574,9 +1573,9 @@ def show_context_links(thisview, datasource, show_filters, enable_commands, enab and (config.user.may("wato.hosts") or config.user.may("wato.seeall")): host = html.request.var("host") if host: - url = watolib.link_to_host_by_name(host) + url = _link_to_host_by_name(host) else: - url = watolib.link_to_folder_by_path(html.request.var("wato_folder", "")) + url = _link_to_folder_by_path(html.request.var("wato_folder", "")) html.context_button( _("WATO"), url, "wato", id_="wato", bestof=config.context_buttons_to_show) @@ -1630,6 +1629,19 @@ def show_context_links(thisview, datasource, show_filters, enable_commands, enab html.end_context_buttons() +def _link_to_folder_by_path(path): + # type: (str) -> str + """Return an URL to a certain WATO folder when we just know its path""" + return html.makeuri_contextless([("mode", "folder"), ("folder", path)], filename="wato.py") + + +def _link_to_host_by_name(host_name): + # type: (str) -> str + """Return an URL to the edit-properties of a host when we just know its name""" + return html.makeuri_contextless([("mode", "edit_host"), ("host", host_name)], + filename="wato.py") + + def update_context_links(enable_command_toggle, enable_checkbox_toggle): html.javascript( "cmk.views.update_togglebutton('commands', %d);" % (enable_command_toggle and 1 or 0)) diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 7ed3399..df40c2a 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -131,7 +131,9 @@ from cmk.gui.valuespec import ( import cmk.gui.watolib.timeperiods from cmk.gui.watolib.utils import ( - wato_root_dir,) + wato_root_dir, + multisite_dir, +) if cmk.is_managed_edition(): import cmk.gui.cme.managed as managed @@ -166,7 +168,6 @@ NO_ITEM = {} # Just an arbitrary unique thing ENTRY_NEGATE_CHAR = "!" # Some paths and directories -multisite_dir = cmk.utils.paths.default_config_dir + "/multisite.d/wato/" sites_mk = cmk.utils.paths.default_config_dir + "/multisite.d/sites.mk" var_dir = cmk.utils.paths.var_dir + "/wato/" audit_log_path = var_dir + "log/audit.log" @@ -2572,16 +2573,6 @@ def validate_host_uniqueness(varname, host_name): # '----------------------------------------------------------------------' -# Create an URL to a certain WATO folder when we just know its path -def link_to_folder_by_path(path): - return "wato.py?mode=folder&folder=" + html.urlencode(path) - - -# Create an URL to the edit-properties of a host when we just know its name -def link_to_host_by_name(host_name): - return "wato.py?" + html.urlencode_vars([("mode", "edit_host"), ("host", host_name)]) - - # Return a list with all the titles of the paths' # components, e.g. "muc/north" -> [ "Main Directory", "Munich", "North" ] def get_folder_title_path(path, with_links=False): diff --git a/cmk/gui/watolib/utils.py b/cmk/gui/watolib/utils.py index acb8acf..9cf7777 100644 --- a/cmk/gui/watolib/utils.py +++ b/cmk/gui/watolib/utils.py @@ -27,3 +27,4 @@ import cmk.utils.paths wato_root_dir = cmk.utils.paths.check_mk_config_dir + "/wato/" +multisite_dir = cmk.utils.paths.default_config_dir + "/multisite.d/wato/"