[checkmk-commits] Check_MK Git: check_mk: FIX: fix hitting enter in host search form on IE

Module: check_mk Branch: master Commit: 8cc4939a20cf74355ce86fbf74dce6457a20c5e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cc4939a20cf74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 13:14:17 2012 +0100 FIX: fix hitting enter in host search form on IE --- ChangeLog | 1 + web/htdocs/views.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4fe79f..1d1f3db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,7 @@ Multisite: * FIX: detail view of host was missing column headers * FIX: fix problem on IE with background color 'white' + * FIX: fix hitting enter in host search form on IE Checks & Agents: * FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 85382d1..1a665f7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1237,7 +1237,7 @@ def show_view(view, show_heading = False, show_buttons = True, painter_options.sort() # Fetch data. Some views show data only after pressing [Search] - if (only_count or (not view["mustsearch"]) or html.var("search")): + if (only_count or (not view["mustsearch"]) or html.var("filled_in") == "filter"): # names for additional columns (through Stats: headers) add_columns = datasource.get("add_columns", []) @@ -1330,7 +1330,7 @@ def render_view(view, rows, datasource, group_painters, painters, # Filter-button if 'F' in display_options and len(show_filters) > 0: - filter_isopen = html.var("search", "") == "" and view["mustsearch"] + filter_isopen = html.var("filled_in") != "filter" and view["mustsearch"] # Show warning-icon if some filter is set label = _("Filter") if html.var("filled_in") == "filter":