[checkmk-commits] 5889 FIX Fixed visible HTML tag in WATO folder permission error message

Module: check_mk Branch: master Commit: 3aada191fb9a62199c952bbbccbfadb9be20d369 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aada191fb9a62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 6 17:06:56 2018 +0100 5889 FIX Fixed visible HTML tag in WATO folder permission error message Change-Id: Ifdb5c13d31a7504ab1a2c6df96ab6abc498ddee5 --- .werks/5889 | 11 +++++++++++ web/htdocs/wato.py | 4 ++-- web/htdocs/watolib.py | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/5889 b/.werks/5889 new file mode 100644 index 0000000..63edbc7 --- /dev/null +++ b/.werks/5889 @@ -0,0 +1,11 @@ +Title: Fixed visible HTML tag in WATO folder permission error message +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1520352233 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cb2425e..515326e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -629,8 +629,8 @@ class ModeFolder(WatoMode): self._folder.show_breadcrump() if not self._folder.may("read"): - html.message(html.render_img("images/icon_autherr.png", class_="authicon") - + " " + self._folder.reason_why_may_not("read")) + html.message(html.render_icon("autherr", cssclass="authicon") + + " " + self._folder.reason_why_may_not("read")) self._folder.show_locking_information() self._show_subfolders_of() diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 4d2b423..5d7311a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -802,7 +802,7 @@ class WithPermissions(object): self.user_needs_permission(user_id, how) return False except MKAuthException, e: - return "%s" % e + return HTML("%s" % e)