[checkmk-commits] Check_MK Git: check_mk: #1531 FIX Fixed exception in event history view when displaying CHANGESTATE events

Module: check_mk Branch: master Commit: 524c7fc406e2833895c2c716a45d875cf4e162a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=524c7fc406e283… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 08:57:40 2014 +0100 #1531 FIX Fixed exception in event history view when displaying CHANGESTATE events --- .werks/1531 | 10 ++++++++++ ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1531 b/.werks/1531 new file mode 100644 index 0000000..846f053 --- /dev/null +++ b/.werks/1531 @@ -0,0 +1,10 @@ +Title: Fixed exception in event history view when displaying CHANGESTATE events +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416902234 + + diff --git a/ChangeLog b/ChangeLog index f3eed41..a5092a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ Event Console: * 1169 Added host state type filter to "recent event history" view + * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events HW/SW-Inventory: * 1479 liveproxyd: new function for collecting remote inventory data... diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 4e8526c..bd2fb95 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -93,12 +93,13 @@ action_whats = { "COUNTFAILED" : _("Event created by required count was not reached in time"), "UPDATE" : _("Event information updated by user"), "NEW" : _("New event created"), - "DELETE" : _("Event deleted manually bu user"), + "DELETE" : _("Event deleted manually by user"), "EMAIL" : _("Email sent"), "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"), + "CHANGESTATE" : _("State of event changed by user"), } def service_levels():