[checkmk-commits] Check_MK Git: check_mk: #1981 FIX Not trying to render view in view editor when the view is not valid

Module: check_mk Branch: master Commit: af283f49ec354dd386a5cef485157e41a52e3f4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af283f49ec354d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 6 16:25:43 2015 +0100 #1981 FIX Not trying to render view in view editor when the view is not valid --- .werks/1981 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/visuals.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1981 b/.werks/1981 new file mode 100644 index 0000000..6a05f34 --- /dev/null +++ b/.werks/1981 @@ -0,0 +1,10 @@ +Title: Not trying to render view in view editor when the view is not valid +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423236294 + + diff --git a/ChangeLog b/ChangeLog index 15c1368..9147bfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -186,6 +186,7 @@ * 1989 FIX: Fix sorting of services in availability views * 1978 FIX: Fixed linking to other views using "joined columns"... * 1980 FIX: logwatch: Fixed exception when acknowledging errors of a single logfile on a single host + * 1981 FIX: Not trying to render view in view editor when the view is not valid WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index e58c2ef..0d33ab8 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -742,7 +742,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, html.button("try", _("Try out")) html.end_form() - if html.has_var("try") or html.has_var("search"): + if (html.has_var("try") or html.has_var("search")) and not html.has_user_errors(): html.set_var("search", "on") if visual: import bi