Module: check_mk
Branch: master
Commit: 8701162281217346a53901506e6a2d30fa60b655
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87011622812173…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 12 15:53:13 2012 +0200
FIX: show multisite warning messages even after page reload
---
ChangeLog | 1 +
web/htdocs/js/checkmk.js | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e094407..c7e372a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
Multisite:
* FIX: fixed localization of general permissions
+ * FIX: show multisite warning messages even after page reload
Livecheck:
* FIX: Compile livecheck also if diet libc is missing
diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js
index 3bae51f..e7e63d8 100644
--- a/web/htdocs/js/checkmk.js
+++ b/web/htdocs/js/checkmk.js
@@ -760,7 +760,10 @@ function handleReload(url) {
else {
// Enforce specific display_options to get only the content data
var display_options = getUrlParam('display_options');
- var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r', 'w' ];
+ // Removed 'w' to reflect original rengering mechanism during reload
+ // For example show the "Your query produced more than 1000 results." message
+ // in views even during reload.
+ var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r' ];
for (var i = 0; i < opts.length; i++) {
if (display_options.indexOf(opts[i].toUpperCase()) > -1)
display_options = display_options.replace(opts[i].toUpperCase(), opts[i]);
Module: check_mk
Branch: master
Commit: 4acd89ee724954ef5bf7d235e5c978754d34cb90
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4acd89ee724954…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 12 15:37:27 2012 +0200
Fixed problem after latest BI improvement
---
web/htdocs/bi.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py
index 14689d3..d293ab3 100644
--- a/web/htdocs/bi.py
+++ b/web/htdocs/bi.py
@@ -121,7 +121,7 @@ def load_services():
tags = vars.get("TAGS", "").split(" ")
entry = (tags, svcs, childs, parents)
services[(site, host)] = entry
- services_by_hostname.setdefault(host, []).append(entry)
+ services_by_hostname.setdefault(host, []).append((site, entry))
return services, services_by_hostname
@@ -288,10 +288,10 @@ def find_matching_services(what, calllist):
if host_re.startswith("^(") and host_re.endswith(")$"):
middle = host_re[2:-2]
if middle in g_user_cache["services_by_hostname"]:
- entries = [ (("", host_re), entry) for entry in g_user_cache["services_by_hostname"][middle] ]
+ entries = [ ((e[0], host_re), e[1]) for e in g_user_cache["services_by_hostname"][middle] ]
host_re = "(.*)"
elif not honor_site and not '*' in host_re and not '$' in host_re and not '|' in host_re:
- entries = [ (("", host_re), entry) for entry in g_user_cache["services_by_hostname"][host_re] ]
+ entries = [ ((e[0], host_re), e[1]) for e in g_user_cache["services_by_hostname"][host_re] ]
else:
entries = g_user_cache["services"].items()
@@ -621,7 +621,7 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE):
found = []
honor_site = SITE_SEP in host_re
if not honor_site and not '*' in host_re and not '$' in host_re and not '|' in host_re:
- entries = [ (("", host_re), entry) for entry in g_user_cache["services_by_hostname"][host_re] ]
+ entries = [ ((e[0], host_re), e[1]) for e in g_user_cache["services_by_hostname"][host_re] ]
else:
entries = g_user_cache["services"].items()