Module: check_mk Branch: master Commit: 36b117f4ce7b9c430a4083167a5b6ea42cd953e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36b117f4ce7b9c… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Dec 5 17:53:04 2014 +0100 #1707 WATO rule editor: show title of tag group when rendering the conditions of a rule This makes things clearer if you use the same tag title in more than one group. --- .bugs/837 | 6 ++++-- .werks/1707 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 14 ++++++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.bugs/837 b/.bugs/837 index 3ea5614..a17d8c6 100644 --- a/.bugs/837 +++ b/.bugs/837 @@ -1,9 +1,9 @@ Title: Service levels are missing in gui Component: multisite -State: open +Class: nastiness +State: done Date: 2013-11-29 17:07:45 Targetversion: 1.2.3i6 -Class: nastiness Its not possible to see the service levels on Hosts/ Services in Multisite. The Reason is, that they are no part of the livestatus output. With cmc its not possible to looking into the configfile to see the sl. @@ -13,3 +13,5 @@ Create: - Filter - Add Detail views of Host / Service - Change Global Settings Group + +2014-12-05 17:41:26: changed state open -> done diff --git a/.werks/1707 b/.werks/1707 new file mode 100644 index 0000000..5aab2a6 --- /dev/null +++ b/.werks/1707 @@ -0,0 +1,9 @@ +Title: WATO rule editor: show title of tag group when rendering the conditions of a rule +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417798331 +Class: feature + +This makes things clearer if you use the same tag title in more than one group. diff --git a/ChangeLog b/ChangeLog index cc45988..bfc596b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -191,6 +191,7 @@ * 1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page * 1562 Move manual checks into a new WATO module... * 1697 Allow non-Ascii characters in topic of host tag groups + * 1707 WATO rule editor: show title of tag group when rendering the conditions of a rule... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 24c94ec..e671adf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14486,12 +14486,18 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): html.write('<li class="condition">') alias = config.tag_alias(tag) + group_alias = config.tag_group_title(tag) if alias: - if negate: - html.write(_("Host is <b>not</b> of type ")) + if group_alias: + html.write(_("Host") + ": " + group_alias + " " + _("is") + " ") + if negate: + html.write("<b>%s</b> " % _("not")) else: - html.write(_("Host is of type ")) - html.write("<b>" + alias + "</b>") + if negate: + html.write(_("Host has tag")) + else: + html.write(_("Host does not have tag")) + html.write(" <b>" + alias + "</b>") else: if negate: html.write(_("Host has <b>not</b> the tag ") + "<tt>" + tag + "</tt>")