Module: check_mk Branch: master Commit: fd0d244d7049408aff306f7ebf5052898190e552 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd0d244d704940… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 8 10:28:20 2015 +0100 #2877 FIX Do not reopen search form when doing actions via Host/Service search --- .werks/2877 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2877 b/.werks/2877 new file mode 100644 index 0000000..cbd11d3 --- /dev/null +++ b/.werks/2877 @@ -0,0 +1,9 @@ +Title: Do not reopen search form when doing actions via Host/Service search +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1449566877 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f311d98..4214fae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -172,6 +172,7 @@ * 2778 FIX: Fixed correct scaling of sidebar on newer versions of Chrome browser * 2781 FIX: Fix role handling of "Custom Links" snapin in case of adapted roles... * 2804 FIX: Avoid redeclaration errors in graphs when using pnp basket... + * 2877 FIX: Do not reopen search form when doing actions via Host/Service search WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index fd9d9c1..23b86b3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1204,7 +1204,7 @@ def render_view(view, rows, datasource, group_painters, painters, html.show_user_errors() # Filter form - filter_isopen = html.var("filled_in") != "filter" and view.get("mustsearch") + filter_isopen = view.get("mustsearch") and not html.var("filled_in") if 'F' in display_options and len(show_filters) > 0: show_filter_form(filter_isopen, show_filters)