Module: check_mk
Branch: master
Commit: a526214d3b9be496af0dcff17f637bba61e3e4dd
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a526214d3b9be4…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Oct 2 15:14:06 2012 +0200
FIX: Try out mode in view editor does not show context buttons anymore
Conflicts:
.bugs/772
---
.bugs/772 | 4 ++--
ChangeLog | 1 +
web/htdocs/views.py | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.bugs/772 b/.bugs/772
index 45aad40..5029aac 100644
--- a/.bugs/772
+++ b/.bugs/772
@@ -8,5 +8,5 @@ Targetversion: 1.2.0
When hitting "Try out" in the edit mode of a view then
the buttons for commands etc are shown but shouldn't.
-2012-10-02 15:15:02: changed state open -> done
-Has been solved.
+2012-10-02 15:12:44: changed state open -> done
+Has just been fixed.
diff --git a/ChangeLog b/ChangeLog
index a781264..1e92aa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
* Added "view" parameter to dashlet_pnpgraph webservice
* FIX: BI: Assuming "OK" for hosts is now possible
* FIX: Fixed error in makeuri() calls when no parameters in URL
+ * FIX: Try out mode in view editor does not show context buttons anymore
WATO
* Added "profile" option to be configurable via browser
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 37711e9..3647eba 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1351,7 +1351,8 @@ def render_view(view, rows, datasource, group_painters, painters,
len(rows) > 0 and \
should_show_command_form(display_options, datasource)
- show_context_links(view, hide_filters, show_filters, display_options,
+ if show_buttons:
+ show_context_links(view, hide_filters, show_filters, display_options,
painter_options, command_form, layout.get('checkboxes',
False))
# User errors in filters