[checkmk-commits] Reload the sidebar after activation

Module: check_mk Branch: master Commit: a57af54a02eec01b8f24fcb8ff62e96e9e7306fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a57af54a02eec0… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Nov 4 16:21:37 2016 +0100 Reload the sidebar after activation --- web/htdocs/js/wato.js | 3 +++ web/htdocs/watolib.py | 12 ++---------- web/plugins/wato/bi.py | 6 +----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 8f5e99f..b5e3b20 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -836,6 +836,9 @@ function finish_activation() // Maybe change this not to make a reload and only update the relevant // parts of the activate changes page. schedule_reload('', 1000); + + // Trigger a reload of the sidebar (to update changes in WATO snapin) + reload_sidebar(); } // .-Profile Repl----------------------------------------------------------. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 0b826be..08311d1 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -127,9 +127,7 @@ wato_root_dir = cmk.paths.check_mk_config_dir + "/wato/" multisite_dir = cmk.paths.default_config_dir + "/multisite.d/wato/" sites_mk = cmk.paths.default_config_dir + "/multisite.d/sites.mk" var_dir = cmk.paths.var_dir + "/wato/" -# TODO: Clean this up! -log_dir = var_dir + "log/" -audit_log_path = log_dir + "audit.log" +audit_log_path = var_dir + "log/audit.log" snapshot_dir = var_dir + "snapshots/" repstatus_file = var_dir + "replication_status.mk" php_api_dir = var_dir + "php-api/" @@ -310,7 +308,7 @@ class ConfigDomainGUI(ConfigDomain): class ConfigDomainEventConsole(ConfigDomain): needs_sync = True - needs_activation = False + needs_activation = True ident = "ec" def activate(self): @@ -3592,12 +3590,6 @@ def get_event_console_sync_sites(): return sites -# TODO: This needs to to be recoded to new mechanism -def update_login_sites_replication_status(): - for site_id in get_login_sites(): - update_replication_status(site_id, {'need_sync': True}) - - def automation_push_snapshot(): site_id = html.var("siteid") diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 6da79fe..d0a9e89 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -161,10 +161,6 @@ class ModeBI(WatoMode): out.write("bi_packs[%r] = %s\n\n" % ( pack_id, self._replace_bi_constants(pprint.pformat(converted_pack, width=50)))) - # Make sure that BI aggregates are replicated to all other sites that allow - # direct user login - update_login_sites_replication_status() - def _convert_pack_to_bi(self, pack): converted_rules = dict([ @@ -859,7 +855,7 @@ class ModeBIPacks(ModeBI): _("Do you really want to delete the BI pack <b>%s</b> <i>%s</i> with <b>%d</b> rules and <b>%d</b> aggregations?") % (pack_id, pack["title"], len(pack["rules"]), len(pack["aggregations"]))) if c: - log_mkeventd("delete-bi-pack", _("Deleted BI pack %s") % pack_id) + self._add_change("delete-bi-pack", _("Deleted BI pack %s") % pack_id) del self._packs[pack_id] self.save_config() elif c == False: