[checkmk-commits] Check_MK Git: check_mk: FIX: Site management: replication setting was lost after re-editing

Module: check_mk Branch: master Commit: a8fd68d99c50dfcd70923a3604e59034734409f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8fd68d99c50df… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu May 24 17:20:11 2012 +0200 FIX: Site management: replication setting was lost after re-editing --- ChangeLog | 1 + web/htdocs/wato.py | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68f5453..f93d1c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * FIX: Added check if contacts belong to contactgroup before contactgroup deletion * FIX: fix site configuration for local site in Multisite environments * FIX: "(no not monitor)" setting in distributed WATO now works + * FIX: Site management: replication setting was lost after re-editing Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a60f3a3..6fd528a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6355,8 +6355,7 @@ def mode_edit_site(phase): # Persist new_site["persist"] = html.get_checkbox("persist") - # Handle the insecure replication flag - new_site["insecure"] = html.get_checkbox("insecure") + # Status host sh_site = html.var("sh_site") @@ -6387,18 +6386,25 @@ def mode_edit_site(phase): multisiteurl = html.var("multisiteurl", "").strip() if repl: if not multisiteurl: - raise MKUserError("multisiteurl", _("Please enter the Multisite URL of the slave/peer site.")) + raise MKUserError("multisiteurl", + _("Please enter the Multisite URL of the slave/peer site.")) if not multisiteurl.endswith("/check_mk/"): - raise MKUserError("multisiteurl", _("The Multisite URL must end with /check_mk/")) + raise MKUserError("multisiteurl", + _("The Multisite URL must end with /check_mk/")) if not multisiteurl.startswith("http://") and not multisiteurl.startswith("https://"): - raise MKUserError("multisiteurl", _("The Multisites URL must begin with <tt>http://</tt> or <tt>https://</tt>.")) + raise MKUserError("multisiteurl", + _("The Multisites URL must begin with <tt>http://</tt> or <tt>https://</tt>.")) if "socket" not in new_site: - raise MKUserError("replication", _("You cannot do replication with the local site.")) + raise MKUserError("replication", + _("You cannot do replication with the local site.")) # Save Multisite-URL even if replication is turned off. That way that # setting is not lost if replication is turned off for a while. new_site["multisiteurl"] = multisiteurl + # Handle the insecure replication flag + new_site["insecure"] = html.get_checkbox("insecure") + # Secret is not checked here, just kept if not new and "secret" in old_site: new_site["secret"] = old_site["secret"] @@ -6519,7 +6525,7 @@ def mode_edit_site(phase): [ ("none", _("No replication with this site")), ("peer", _("Peer: synchronize configuration with this site")), ("slave", _("Slave: push configuration to this site")) - ]) + ], site.get("replication", "none")) html.help( _("WATO replication allows you to manage several monitoring sites with a " "logically centralized WATO. Slave sites receive their configuration " "from master sites. Several master sites can build a peer-to-peer "