[checkmk-commits] Check_MK Git: check_mk: #2026 FIX Fixed exception when using umlauts in notification plugin descriptions

Module: check_mk Branch: master Commit: 0cab19c09a677ee9e3bc9cca4dd7d3ab1d1f8fa4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cab19c09a677e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 27 09:56:27 2015 +0100 #2026 FIX Fixed exception when using umlauts in notification plugin descriptions This happened only when using an umlaut in notification plugin descriptions together with a localized Multisite GUI. Again, fixed with super encoding power! --- .werks/2026 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2026 b/.werks/2026 new file mode 100644 index 0000000..9b2ec23 --- /dev/null +++ b/.werks/2026 @@ -0,0 +1,12 @@ +Title: Fixed exception when using umlauts in notification plugin descriptions +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1425027302 +Class: fix + +This happened only when using an umlaut in notification plugin descriptions +together with a localized Multisite GUI. + +Again, fixed with super encoding power! diff --git a/ChangeLog b/ChangeLog index 2826f2e..aa19dc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -291,6 +291,7 @@ * 1946 FIX: WATO Web-API: edit host action does no longer unset all unspecified attributes... * 1223 FIX: Fixed manual configuration of ntp peer check... * 2025 FIX: Fixed exception when synchronising custom ldap attributes in distributed WATO setup + * 2026 FIX: Fixed exception when using umlauts in notification plugin descriptions... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9f2deb9..a7e35e7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11474,7 +11474,7 @@ def load_notification_scripts(): def notification_script_choices(): scripts = load_notification_scripts() - choices = [ (name, info["title"]) for (name, info) in scripts.items() ] + choices = [ (name, info["title"].decode('utf-8')) for (name, info) in scripts.items() ] choices.append((None, _("ASCII Email (legacy)"))) choices.sort(cmp = lambda a,b: cmp(a[1], b[1])) # Make choices localizable