[checkmk-commits] 4221 FIX Fixed "analyse parameters" page for services with umlauts in names

Module: check_mk Branch: master Commit: 7029e4f2ff15d20af9aba2dad18dcd8a7fdac1f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7029e4f2ff15d2… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Dec 23 10:38:21 2016 +0100 4221 FIX Fixed "analyse parameters" page for services with umlauts in names Change-Id: If789f8d52ad3cca4749e53ae0bc05596948cb34e --- .werks/4221 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4221 b/.werks/4221 new file mode 100644 index 0000000..ea3fa3f --- /dev/null +++ b/.werks/4221 @@ -0,0 +1,9 @@ +Title: Fixed "analyse parameters" page for services with umlauts in names +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482485868 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 970db7b..b05e768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) + * 4221 FIX: Fixed "analyse parameters" page for services with umlauts in names Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 522b3c5..22e4ae1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2097,7 +2097,7 @@ def mode_object_parameters(phase): if host is None: raise MKGeneralException(_('The given host does not exist.')) host.need_permission("read") - service = html.var("service") + service = html.get_unicode_input("service") if phase == "title": title = _("Parameters of") + " " + hostname diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fc7ae4e..cc67dcb 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -5490,6 +5490,8 @@ def check_mk_local_automation(command, args=None, indata="", stdin_data=None, ti html.show_error(_("<h1>Cannot activate changes</h1>%s") % e) return + cmd = [ make_utf8(a) for a in cmd ] + try: # This debug output makes problems when doing bulk inventory, because # it garbles the non-HTML response output