Module: check_mk
Branch: master
Commit: 55df84ebf6543bf0444c7324c2dffb6f3ad1b745
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55df84ebf6543b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Dec 21 16:54:59 2016 +0100
4218 FIX Disabling replication with a site did not clear the changes for this site
(1.4.0i3 regression)
Change-Id: I05fb47bd22d28b001d16bf02e9209f69a70ab03a
---
.werks/4218 | 9 +++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 10 ++++++----
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/.werks/4218 b/.werks/4218
new file mode 100644
index 0000000..d4070d7
--- /dev/null
+++ b/.werks/4218
@@ -0,0 +1,9 @@
+Title: Disabling replication with a site did not clear the changes for this site (1.4.0i3
regression)
+Level: 1
+Component: wato
+Compatible: compat
+Version: 1.4.0i4
+Date: 1482335663
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 354153c..2bee0d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@
* 4217 WATO rules can now be moved via drag&drop...
* 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO
service discovery
* 4146 FIX: Fixed broken "Global settings" when having the Event Console
disabled via "omd config"
+ * 4218 FIX: Disabling replication with a site did not clear the changes for this site
(1.4.0i3 regression)
Notifications:
* 4197 FIX: Fix sending notification to global fallback email address
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 2951568..eb1dac4 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -9323,11 +9323,13 @@ def mode_edit_site(phase):
# affecting all domains
add_change("edit-sites", msg, sites=[id],
domains=ConfigDomain.enabled_domains())
+ # In case a site is not being replicated anymore, confirm all changes for this
site!
+ if not repl:
+ clear_site_replication_status(id)
+
if id != config.omd_site():
- # On central site issue a change only for the GUI
- # NOTE: Was marking all to be restarted (ec and core) before, but I
don't
- # think that this was really needed.
- add_change("edit-sites", msg, sites=[id],
domains=[ConfigDomainGUI])
+ # On central site issue a change only affecting the GUI
+ add_change("edit-sites", msg, sites=[config.omd_site()],
domains=[ConfigDomainGUI])
return "sites"