[checkmk-commits] Check_MK Git: check_mk: WATO: allow UTF 8 encoded permission translations

Module: check_mk Branch: master Commit: 5a2531e6a73a853f7c8ea877d43643b695821eab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a2531e6a73a85… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Feb 13 17:05:29 2012 +0100 WATO: allow UTF 8 encoded permission translations --- ChangeLog | 1 + web/htdocs/wato.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1df497f..0d28249 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Better output in case of inventory error * FIX: fix bug in host_icon rule on non OMD * FIX: do not use isdisjoint() (was in rule editor on Lenny) + * FIX: allow UTF-8 encoded permission translations Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 49188f9..10dcdc1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7379,7 +7379,9 @@ def mode_edit_role(phase): pvalue = role["permissions"].get(pname) def_value = base_role_id in perm["defaults"] - html.write("<tr><td class=left>%s<br><i>%s</i></td>" % (perm["title"], perm["description"])) + html.write("<tr><td class=left>%s<br><i>%s</i></td>" % ( + make_unicode(perm["title"]), make_unicode(perm["description"]))) + html.write("<td class=right>") choices = [ ( "yes", _("yes")), ( "no", _("no")), @@ -7396,6 +7398,12 @@ def mode_edit_role(phase): html.hidden_fields() html.end_form() +def make_unicode(s): + if type(s) != unicode: # assume utf-8 encoded bytestring + return s.decode("utf-8") + else: + return s + def load_roles(): # Fake builtin roles into user roles.