1 Jun
2012
1 Jun
'12
3:09 a.m.
Module: check_mk
Branch: master
Commit: e5d243a589241c5776c484c24ca2c4a5610451e7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5d243a589241c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jun 1 10:08:38 2012 +0200
FIX: Context links added by hooks are now hidden by the display
option "B" again
---
ChangeLog | 4 +++-
web/htdocs/views.py | 7 +++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 54a1456..93992a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,9 @@
* Make heading in each page clickable -> reload page
* FIX: Edit view: couldn't edit filter settings
* FIX: Fixed styling of links in multisite context help
- * IX: Fixed "select all" button for IE
+ * FIX: Fixed "select all" button for IE
+ * FIX: Context links added by hooks are now hidden by the display
+ option "B" again
WATO:
* IX: Fixed "select all" button in hosts & folders for IE
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index d253b3f..5d7cc82 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1592,7 +1592,8 @@ def show_context_links(thisview, active_filters, show_filters,
display_options,
painter_options, command_form, show_checkboxes):
# html.begin_context_buttons() called automatically by html.context_button()
# That way if no button is painted we avoid the empty container
- execute_hooks('buttons-begin')
+ if 'B' in display_options:
+ execute_hooks('buttons-begin')
filter_isopen = html.var("filled_in") != "filter" and
thisview["mustsearch"]
if 'F' in display_options:
@@ -1668,7 +1669,9 @@ def show_context_links(thisview, active_filters, show_filters,
display_options,
(thisview["owner"], thisview["name"], backurl)
html.context_button(_("Edit View"), url, "edit",
id="edit", bestof=config.context_buttons_to_show)
- execute_hooks('buttons-end')
+ if 'B' in display_options:
+ execute_hooks('buttons-end')
+
html.end_context_buttons()
# Collect all views that share a context with thisview. For example