Module: check_mk
Branch: master
Commit: 688c0642f572fce6f1cb75175ff3e3b25f65f0a5
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=688c0642f572fc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Oct 4 12:21:09 2012 +0200
WATO "activate changes" - Internal code improvment
---
web/htdocs/js/wato.js | 4 +++-
web/htdocs/wato.py | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js
index 908683b..f96dd1d 100644
--- a/web/htdocs/js/wato.js
+++ b/web/htdocs/js/wato.js
@@ -488,7 +488,9 @@ function update_bulk_moveto(val) {
// | |
// +----------------------------------------------------------------------+
-function wato_do_activation(siteid, est) {
+function wato_do_activation(est) {
+ var siteid = 'local';
+
// Hide the activate changes button
var button = document.getElementById('act_changes_button');
if(button) {
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 2a0e216..286fa6c 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3573,9 +3573,9 @@ def mode_changelog(phase):
html.write('<tr class="data odd0"><td
class=repprogress><div
id="repstate_local"></div></td>')
html.write('<td
id="repmsg_local"><i>%s</i></td></tr></table>'
% _('activating...'))
- srs = load_replication_status().get('local', {})
+ srs = load_replication_status().get(None, {})
estimated_duration = srs.get("times", {}).get('act', 2.0)
- html.javascript("wato_do_activation('local', %d);" %
+ html.javascript("wato_do_activation(%d);" %
(int(estimated_duration * 1000.0)))
sitestatus_do_async_replication = None # could survive in global context!
@@ -7192,7 +7192,7 @@ def ajax_activation():
start = time.time()
check_mk_local_automation(config.wato_activation_method)
duration = time.time() - start
- update_replication_status('local', {}, { 'act': duration })
+ update_replication_status(None, {}, { 'act': duration })
except Exception:
import traceback
raise MKUserError(None, "Error executing hooks: %s" %