[checkmk-commits] Check_MK Git: check_mk: FIX: Making "action" context link unclickable during handling actions / confirms

Module: check_mk Branch: master Commit: 0519760026bb09e6cd3a2017370aca73fc647dcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0519760026bb09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 10:22:00 2013 +0100 FIX: Making "action" context link unclickable during handling actions / confirms --- ChangeLog | 1 + web/htdocs/views.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f48e00..fc9d552 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * Improved debug logging of ldap syncs (Now writing duration of queries to log) * Displaying date/time of comments in comment icon hover menu (Please note: You need to update your livestatus to current version to make this work) + * FIX: Making "action" context link unclickable during handling actions / confirms BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c3c5fb1..9318519 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1429,13 +1429,17 @@ def render_view(view, rows, datasource, group_painters, painters, if show_buttons: update_context_links( # don't take display_options into account here ('c' is set during reload) - row_count > 0 and should_show_command_form('C', datasource), + row_count > 0 and should_show_command_form('C', datasource) \ + and not html.do_actions(), can_display_checkboxes ) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"): play_alarm_sounds() + else: + # Always hide action related context links in this situation + update_context_links(False, False) # In multi site setups error messages of single sites do not block the # output and raise now exception. We simply print error messages here.