[checkmk-commits] Additional cleanup

Module: check_mk Branch: master Commit: 9ca3f352e60bdf314e3bf054dcf0d560b3b2f24a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ca3f352e60bdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 08:46:32 2016 +0100 Additional cleanup Change-Id: I136da85ccef9ef4ab8485c25724504cb70a57727 --- web/htdocs/wato.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 422bd6c..7e92a37 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12150,6 +12150,7 @@ def rule_search_button(search_options=None, mode="rulesets"): delvars=["filled_in"]), "search", hot=bool(search_options)) + class ModeEditRuleset(WatoMode): def __init__(self): self._from_vars() @@ -12162,6 +12163,7 @@ class ModeEditRuleset(WatoMode): if not may_edit_ruleset(self._name): raise MKAuthException(_("You are not permitted to access this ruleset.")) + # TODO: Clean this up. In which case is it used? self._item = None if html.var("check_command"): check_command = html.var("check_command") @@ -12186,19 +12188,16 @@ class ModeEditRuleset(WatoMode): raise MKUserError("varname", _("The ruleset \"%s\" does not exist.") % self._name) if not self._item: + self._item = NO_ITEM if html.has_var("item"): try: self._item = mk_eval(html.var("item")) except: - self._item = NO_ITEM - else: - self._item = NO_ITEM + pass - self._hostname = html.var("host") - if self._hostname: - host = Folder.current().host(self._hostname) - if not host: - self._hostname = None # host not found. Should not happen + hostname = html.var("host") + if hostname and Folder.current().has_host(self._hostname): + self._hostname = hostname def title(self): @@ -12529,7 +12528,7 @@ class ModeEditRuleset(WatoMode): # TODO: Refactor this whole method - def _rule_conditions(rulespec, tagspecs, host_list, item_list, varname, folder): + def _rule_conditions(self, rulespec, tagspecs, host_list, item_list, varname, folder): html.open_ul(class_="conditions") # Host tags @@ -12548,7 +12547,7 @@ class ModeEditRuleset(WatoMode): if group_alias: html.write_text(_("Host") + ": " + group_alias + " " + _("is") + " ") if negate: - html.b(_("not")) + html.b(_("not") + " ") else: if negate: html.write_text(_("Host does not have tag"))