Module: check_mk
Branch: master
Commit: 33790f103b6d45f97ccda9c40052047e44a2e8d2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33790f103b6d45…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jan 16 08:24:14 2015 +0100
#1816 FIX Fixed garbled output on "rename host" result page
---
.werks/1816 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 4 ++--
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.werks/1816 b/.werks/1816
new file mode 100644
index 0000000..ebcc598
--- /dev/null
+++ b/.werks/1816
@@ -0,0 +1,10 @@
+Title: Fixed garbled output on "rename host" result page
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1421393030
+
+
diff --git a/ChangeLog b/ChangeLog
index d90793b..a9d8502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,7 @@
* 1805 FIX: Changing roles marks sites where users can login dirty for sync now...
* 1211 FIX: Fixed g_git_messages error on activate changes...
* 1212 FIX: Fixed default value in wato parameter page for timeperiods...
+ * 1816 FIX: Fixed garbled output on "rename host" result page
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 900ab19..9aba1dd 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2249,8 +2249,8 @@ def mode_rename_host(phase):
log_commit_pending() # All activated by the underlying rename automation
html.set_var("host", newname)
action_txt = "".join([ "<li>%s</li>" % a for
a in actions ])
- return "edithost", _("Renamed host <b>%s</b> into
<b>%s</b> at the following places:<br><ul>%s</ul>") %
(
- hostname, newname, action_txt)
+ return "edithost", HTML(_("Renamed host <b>%s</b>
into <b>%s</b> at the following
places:<br><ul>%s</ul>") % (
+ hostname, newname, action_txt))
elif c == False: # not yet confirmed
return ""
return