Module: check_mk
Branch: master
Commit: 22ff28cbdf98b7cfecdcbeb637fd1093eb88a81c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22ff28cbdf98b7…
Author: Sebastian Herbord <sh(a)mathias-kettner.de>
Date: Fri Nov 6 16:28:09 2015 +0100
#2709 FIX fixed exception when opening the action menu
Opening the action menu would cause an exception
if icons have been customized to show in main table.
---
.werks/2709 | 10 ++++++++++
ChangeLog | 1 +
web/plugins/icons/builtin.py | 3 ++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/2709 b/.werks/2709
new file mode 100644
index 0000000..651302b
--- /dev/null
+++ b/.werks/2709
@@ -0,0 +1,10 @@
+Title: fixed exception when opening the action menu
+Level: 1
+Component: multisite
+Compatible: compat
+Version: 1.2.7i4
+Date: 1446823507
+Class: fix
+
+Opening the action menu would cause an exception
+if icons have been customized to show in main table.
diff --git a/ChangeLog b/ChangeLog
index 1ab4c03..523f710 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@
* 2717 FIX: Fixed broken webserver level authentication integration (e.g. basic,
kerberos)...
* 2722 FIX: Fixed some icon links from views opening in dashlet frames instead of the
whole page...
* 2729 FIX: Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering
lists
+ * 2709 FIX: fixed exception when opening the action menu...
WATO:
* 2442 WATO remove host: improved cleanup of obsolete host files...
diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py
index ef8a083..127e5f0 100644
--- a/web/plugins/icons/builtin.py
+++ b/web/plugins/icons/builtin.py
@@ -198,7 +198,8 @@ def paint_rule_editor(what, row, tags, host_custom_vars):
return 'rulesets', title, html.makeuri_contextless(urlvars,
"wato.py")
multisite_icons_and_actions['rule_editor'] = {
- 'service_columns': [ 'check_type', 'description',
'check_command', "host_name" ],
+ 'columns': [ 'check_type', "host_name" ],
+ 'service_columns': [ 'description' ],
'paint': paint_rule_editor,
}