[checkmk-commits] Check_MK Git: check_mk: #2356 FIX Fixed exception in Multisite JSON output

Module: check_mk Branch: master Commit: 77e99de0f5fa6babec54a00ac39908773edfd3dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77e99de0f5fa6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 18 11:34:29 2015 +0200 #2356 FIX Fixed exception in Multisite JSON output --- .werks/2356 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 1 - 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2356 b/.werks/2356 new file mode 100644 index 0000000..f23cfaf --- /dev/null +++ b/.werks/2356 @@ -0,0 +1,10 @@ +Title: Fixed exception in Multisite JSON output +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1434620049 + + diff --git a/ChangeLog b/ChangeLog index 78fb1bc..acca58e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 2338 FIX: Logging internal GUI exceptions to web.log instead of apache error_log... * 2340 FIX: Email validation: Top level domains can now have a maximum length of 24 characters * 2353 FIX: Fix showing options for availability in BI mode, where above header + * 2356 FIX: Fixed exception in Multisite JSON output WATO: * 1254 The target address for crash reports can now be configured in wato global settings diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 7b3c517..b29692f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -202,7 +202,6 @@ def process_multisite_icons(what, row, tags, custom_vars): n = n[:-4] elif n.endswith(".gif"): n = n[:-4] - output += ' '+n.encode('utf-8') icons.append((toplevel, sort_index, n.encode('utf-8'), None, None)) continue