Module: check_mk
Branch: master
Commit: 074d8381581a894e2e527dd2160ca3e11569365d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=074d8381581a89…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Apr 17 16:15:27 2013 +0200
FIX: fix bug where certain settings where not saved on IE.
---
ChangeLog | 4 ++++
web/htdocs/js/checkmk.js | 1 +
2 files changed, 5 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index deeb54a..a390aad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,10 @@
WATO:
* Improved handling of valuespec validations in WATO rule editor. Displaying a
warning message when going to throw away the current settings.
+ * FIX: fix bug where certain settings where not saved on IE. This was mainly
+ on IE7, but also IE8,9,10 in IE7 mode (which is often active). Affected
+ was e.g. the nodes of a cluster or the list of services for service
+ inventory
1.2.2:
Core:
diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js
index 46d5cae..5d03edf 100644
--- a/web/htdocs/js/checkmk.js
+++ b/web/htdocs/js/checkmk.js
@@ -1568,6 +1568,7 @@ function list_of_strings_extend(oInput, j) {
oNewDiv.innerHTML = oDiv.innerHTML.replace('"' + oldName + '"', '"' + newName + '"');
// IE7 does not have quotes in innerHTML, trying to workaround this here.
oNewDiv.innerHTML = oNewDiv.innerHTML.replace('=' + oldName + ' ', '=' + newName + ' ');
+ oNewDiv.innerHTML = oNewDiv.innerHTML.replace('=' + oldName + '>', '=' + newName + '>');
oContainer.appendChild(oNewDiv);
/* Move focus function from old last to new last input field */
Module: check_mk
Branch: master
Commit: f690a3e391540b3826bc27c78eb838036e90f50d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f690a3e391540b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Apr 17 13:25:33 2013 +0200
FIX: Fixed handling of dashboards without title in sidebar view snapi
Conflicts:
ChangeLog
---
ChangeLog | 3 ++-
web/plugins/sidebar/shipped.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e6de736..deeb54a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
1.2.3i1:
Core:
* Agents can send data for other hosts "piggyback". This is being
@@ -115,6 +114,8 @@
* FIX: do not remove directories of non-exisant users anymore. This lead to
a deletion of users' settings in case of an external authentication
(like mod_ldap).
+ * FIX: Fixed handling of dashboards without title in sidebar view snapin
+
WATO:
* Improved handling of valuespec validations in WATO rule editor. Displaying a
warning message when going to throw away the current settings.
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index f9755d4..1efc109 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -76,7 +76,7 @@ def views_by_topic():
if not view["hidden"] and not view.get("mobile")]
# Add all the dashboards to the views list
- s += [ (_('Dashboards'), d['title'], d_name)
+ s += [ (_('Dashboards'), d['title'] and d['title'] or d_name, d_name)
for d_name, d
in dashboard.dashboards.items()
]
Module: check_mk
Branch: master
Commit: bacbd3bb5853029de68e97d0888900b24535472e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bacbd3bb585302…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Apr 17 12:01:38 2013 +0200
g_hostname is now also available in argument_functions of checks
---
modules/check_mk.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index dceed76..cde68c5 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1924,6 +1924,10 @@ define service {
if actchecks:
outfile.write("\n\n# Active checks\n")
for acttype, act_info, params in actchecks:
+ # Make hostname available as global variable in argument functions
+ global g_hostname
+ g_hostname = hostname
+
has_perfdata = act_info.get('has_perfdata', False)
description = act_info["service_description"](params)
# compute argument, and quote ! and \ for Nagios