[checkmk-commits] Check_MK Git: check_mk: #2397 FIX Fixed wrong confirm text in distributed setup when activating foreign changes

Module: check_mk Branch: master Commit: 0d639213a87e51f5a10a8e0390cb103fecf9cd60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d639213a87e51… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Jul 13 09:29:46 2015 +0200 #2397 FIX Fixed wrong confirm text in distributed setup when activating foreign changes --- .werks/2397 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/2397 b/.werks/2397 new file mode 100644 index 0000000..d9b93df --- /dev/null +++ b/.werks/2397 @@ -0,0 +1,10 @@ +Title: Fixed wrong confirm text in distributed setup when activating foreign changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436772548 + + diff --git a/ChangeLog b/ChangeLog index 145acba..3a93a3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 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... + * 2397 FIX: Fixed wrong confirm text in distributed setup when activating foreign changes 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 4266db0..7d07670 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4735,7 +4735,7 @@ def mode_changelog(phase): html.context_button(_("Audit Log"), make_link([("mode", "auditlog")]), "auditlog") elif phase == "action": - action = html.var("_action") + action = html.var("_action", html.var("_siteaction")) if action == "activate": # Let host validators do their work defective_hosts = validate_all_hosts([], force_all = True) @@ -4755,10 +4755,14 @@ def mode_changelog(phase): (config.alias_of_user(user_id), count, _("changes")) table += '</table>' - if action == "activate": + if action in [ "activate", "sync_restart", "restart" ]: title = _("Confirm activating foreign changes") text = _("There are some changes made by your colleagues that you will " "activate if you proceed:") + elif action == "sync": + title = _("Confirm synchronizing foreign changes") + text = _("There are some changes made by your colleagues that you will " + "synchronize if you proceed:") else: title = _("Confirm discarding foreign changes") text = _("There are some changes made by your colleagues that you will "