[checkmk-commits] Check_MK Git: check_mk: #1704 FIX Fix notification analyser in case there are non-Ascii characters in the notification context

Module: check_mk Branch: master Commit: eca90b1a0e69c0d3927d4f834037c0d0dc371785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca90b1a0e69c0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 12:19:42 2014 +0100 #1704 FIX Fix notification analyser in case there are non-Ascii characters in the notification context --- .werks/1704 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1704 b/.werks/1704 new file mode 100644 index 0000000..b17463c --- /dev/null +++ b/.werks/1704 @@ -0,0 +1,9 @@ +Title: Fix notification analyser in case there are non-Ascii characters in the notification context +Level: 2 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1417778357 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 53493b4..6a9497e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -220,6 +220,7 @@ * 1583 FIX: Can use contact groups without hosts/services assigned in RBN rules now... * 1606 FIX: Moved notify.log to var/log/notify.log in OMD environments... * 1570 FIX: Fix notification of check_http active checks with Nagios core... + * 1704 FIX: Fix notification analyser in case there are non-Ascii characters in the notification context BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 404c42e..24c94ec 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8865,8 +8865,8 @@ def mode_notifications(phase): analyse_url = html.makeuri([("analyse", str(nr))]) context = entry.items() context.sort() - tooltip = "".join("%s: %s\n" % e for e in context) - html.icon_button(analyse_url, _("Anaylse ruleset with this notification:\n" + tooltip), "analyze") + tooltip = "".join(("%s: %s\n" % e).decode('utf-8') for e in context) + html.icon_button(analyse_url, _("Anaylse ruleset with this notification:\n%s" % tooltip), "analyze") replay_url = html.makeactionuri([("_replay", str(nr))]) html.icon_button(replay_url, _("Replay this notification, send it again!"), "replay") if html.var("analyse") and nr == int(html.var("analyse")):