Module: check_mk
Branch: master
Commit: 748548df5f6d7cebcb17619fde5d8192a860176c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=748548df5f6d7c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Oct 20 12:54:36 2013 -0400
FIX: Avoid timed browser reload after execution of exections
Still the wohl workflow is stull much too complicated in the
implementation. There are still some subtle work flows where
things do not work out correctly.
---
.bugs/977 | 8 ++++++--
ChangeLog | 1 +
web/htdocs/views.py | 6 ++++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.bugs/977 b/.bugs/977
index 913fa05..1a1a0ff 100644
--- a/.bugs/977
+++ b/.bugs/977
@@ -1,9 +1,9 @@
Title: Invalid reload after command execution
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2013-06-23 11:21:05
Targetversion: 1.2.3i5
-Class: bug
When you issue a command on hosts/services and confirm then you see a blue
message with a link back to the view. In that situation there must be no
@@ -14,3 +14,7 @@ An even better resolution would be to drop that intermediate page at
all and instead print the result of the command in a kind of overlay
window that goes away after a view seconds or when you hover over
it. That saves one mouse click.
+
+2013-10-20 12:53:59: changed state open -> done
+Disabled reload after execution of actions and also
+during confirmation.
diff --git a/ChangeLog b/ChangeLog
index 2dc4a71..6093cb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
* FIX: Fix output format python for several numeric columns
* FIX: Fixed searching hosts by aliases/adresses
* FIX: Remove duplicate entries from Quicksearch
+ * FIX: Avoid timed browser reload after execution of exections
BI:
* FIX: Fix exception when showing BI tree in reporting time warp
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 6420737..5958fc0 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1429,6 +1429,8 @@ def render_view(view, rows, datasource, group_painters, painters,
show_checkboxes, layout, num_columns, show_filters, show_footer,
hide_filters,
browser_reload):
+ if html.transaction_valid() and html.do_actions():
+ html.set_browser_reload(0)
# Show heading (change between "preview" mode and full page mode)
if show_heading:
@@ -1528,8 +1530,8 @@ 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) \
- and not html.do_actions(),
+ row_count > 0 and should_show_command_form('C',
datasource),
+ # and not html.do_actions(),
can_display_checkboxes
)