[checkmk-commits] Check_MK Git: check_mk: #1160 FIX Fixed wrong named column in mkeventd rules

Module: check_mk Branch: master Commit: 794896a57e3a106ad5eec69e1a4e212717bbc4b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=794896a57e3a10… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Oct 20 08:42:57 2014 +0200 #1160 FIX Fixed wrong named column in mkeventd rules --- .werks/1160 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1160 b/.werks/1160 new file mode 100644 index 0000000..612a49f --- /dev/null +++ b/.werks/1160 @@ -0,0 +1,9 @@ +Title: Fixed wrong named column in mkeventd rules +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1413787357 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 24ba0a6..3185931 100644 --- a/ChangeLog +++ b/ChangeLog @@ -150,6 +150,7 @@ * 1109 FIX: WATO active checks: passwords no longer shown as plain text.... * 1119 FIX: WATO create rule: No longer raises an incorrect permission warning when creating a new rule... * 1121 FIX: Rule based notifications formular: No longer raises Request-Uri-Too-Large errors... + * 1160 FIX: Fixed wrong named column in mkeventd rules Notifications: * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 81304c4..b5300f9 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1006,7 +1006,7 @@ def mode_mkeventd_rules(phase): table.cell(_("ID"), '<a href="%s">%s</a>' % (edit_url, rule["id"])) if rule.get("drop"): - table.cell(_("Priority"), _("DROP"), css="state statep") + table.cell(_("State"), _("DROP"), css="state statep") else: if type(rule['state']) == tuple: stateval = rule["state"][0] @@ -1016,7 +1016,7 @@ def mode_mkeventd_rules(phase): 2: _("CRIT"), 3:_("UNKNOWN"), -1: _("(syslog)"), 'text_pattern':_("(set by message text)") }[stateval] - table.cell(_("Priority"), txt, css="state state%s" % stateval) + table.cell(_("State"), txt, css="state state%s" % stateval) # Syslog priority if "match_priority" in rule: