[checkmk-commits] Check_MK Git: check_mk: #1267 FIX Fixed confirm activating foreign changes dialog

Module: check_mk Branch: master Commit: abdd3bb7df127a778e7adb38762dcd0b1233fe24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abdd3bb7df127a… Author: Bastian Kuhn &lt;bk(a)mathias-kettner.de&gt; Date: Thu Jul 9 09:35:11 2015 +0200 #1267 FIX Fixed confirm activating foreign changes dialog The HTML Output is not longer displayed in the Browser --- .werks/1267 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/1267 b/.werks/1267 new file mode 100644 index 0000000..389daaa --- /dev/null +++ b/.werks/1267 @@ -0,0 +1,11 @@ +Title: Fixed confirm activating foreign changes dialog +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436427244 + +The HTML Output is not longer displayed in the Browser + diff --git a/ChangeLog b/ChangeLog index 6a248a5..ba0baca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 2344 FIX: Improved validation of selected rules when editing BI aggregations... * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules * 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner + * 1267 FIX: Fixed confirm activating foreign changes dialog... Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aba0f43..7040c0d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4751,8 +4751,8 @@ def mode_changelog(phase): "discard if you proceed:") c = wato_confirm(title, - '<img class=foreignchanges src="images/icon_foreign_changes.png">' + text + table + - _("Do you really want to proceed?")) + HTML('<img class=foreignchanges src="images/icon_foreign_changes.png">' + text + table + + _("Do you really want to proceed?"))) if c == False: return "" elif not c: