Module: check_mk
Branch: master
Commit: 3fdb53d600e420c6f21913951683b10a5a08a5ce
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fdb53d600e420…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Nov 14 17:06:21 2013 +0100
FIX Checkboxes for hosts/services were missing on modified views
If you have modified a view then activating the checkbox for hosts
or services would not work anymore. This bug was introduced by the
new option for forcing the checkboxes to be enabled in a view. This
has now been fixed.
---
.werks/6 | 11 +++++++++++
ChangeLog | 1 +
web/htdocs/views.py | 3 ++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/6 b/.werks/6
new file mode 100644
index 0000000..23bff0b
--- /dev/null
+++ b/.werks/6
@@ -0,0 +1,11 @@
+Title: Checkboxes for hosts/services were missing on modified views
+Level: 2
+Component: multisite
+Version: 1.2.3i7
+Date: 1384445099
+Class: fix
+
+If you have modified a view then activating the checkbox for hosts
+or services would not work anymore. This bug was introduced by the
+new option for forcing the checkboxes to be enabled in a view. This
+has now been fixed.
diff --git a/ChangeLog b/ChangeLog
index 1a0966c..ef447a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
* 0206 FIX: Fixed logwatch permission check when using liveproxy...
* 0210 FIX: LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN
* 0035 FIX: display http[s] links in plugin output
+ * 0006 FIX: Checkboxes for hosts/services were missing on modified views...
WATO:
* 0053 New rule for configuring the display_name of a service...
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 58a5c13..9386859 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1262,7 +1262,8 @@ def show_view(view, show_heading = False, show_buttons = True,
num_columns = vo.get("num_columns",
view.get("num_columns", 1))
browser_reload = vo.get("refresh",
view.get("browser_reload", None))
- show_checkboxes = view.get("force_checkboxes",
html.var('show_checkboxes', '0') == '1')
+ force_checkboxes = view.get("force_checkboxes", False)
+ show_checkboxes = force_checkboxes or html.var('show_checkboxes',
'0') == '1'
# Get the datasource (i.e. the logical table)
datasource = multisite_datasources[view["datasource"]]