[checkmk-commits] Check_MK Git: check_mk: FIX Fixed multisite exception caused by missing explanation text for a AUTODELETE event action

Module: check_mk Branch: master Commit: 39fbc7e3d8ba3c027a4b86357986bc0245e5d4b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39fbc7e3d8ba3c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 18 10:15:50 2014 +0200 FIX Fixed multisite exception caused by missing explanation text for a AUTODELETE event action --- .werks/939 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/939 b/.werks/939 new file mode 100644 index 0000000..06cbc14 --- /dev/null +++ b/.werks/939 @@ -0,0 +1,9 @@ +Title: Fixed multisite exception caused by missing explanation text for a AUTODELETE event action +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i4 +Date: 1403079248 + + diff --git a/ChangeLog b/ChangeLog index 76b4179..6cc5539 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 0166 FIX: mobile gui: Fixed colors of command list... * 0820 FIX: Fixed wrong NagVis links in "custom links" snapin * 0938 FIX: logwatch: fixed incorrect display of warning messages + * 0939 FIX: Fixed multisite exception caused by missing explanation text for a AUTODELETE event action WATO: * 0987 New button for updating DNS cache... diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 8e056f5..517cc46 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -88,7 +88,7 @@ action_whats = { "NOCOUNT" : _("Event deleted in counting state because rule does not count anymore"), "DELAYOVER" : _("Event opened because the delay time has elapsed before cancelling event arrived."), "EXPIRED" : _("Event deleted because its livetime expired"), - "COUNTREACHED" : _("Event deleted bacause required count had been reached"), + "COUNTREACHED" : _("Event deleted because required count had been reached"), "COUNTFAILED" : _("Event created by required count was not reached in time"), "UPDATE" : _("Event information updated by user"), "NEW" : _("New event created"), @@ -97,6 +97,7 @@ action_whats = { "SCRIPT" : _("Script executed"), "CANCELLED" : _("The event was cancelled because the corresponding OK message was received"), "ARCHIVED" : _("Event was archived because no rule matched and archiving is activated in global settings."), + "AUTODELETE" : _("Event was deleted automatically"), } def service_levels():