[checkmk-commits] Removed broken try function from view editor

Module: check_mk Branch: master Commit: fc6d40a795be0cc8befe95d0c7d40df587edd33d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc6d40a795be0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 2 10:10:38 2016 +0200 Removed broken try function from view editor --- web/htdocs/views.py | 3 --- web/htdocs/visuals.py | 23 +++++------------------ 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 687c01e..2d76577 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -710,7 +710,6 @@ def page_edit_view(): load_handler = transform_view_to_valuespec_value, create_handler = create_view_from_valuespec, info_handler = get_view_infos, - try_handler = lambda view: show_view(view, False, False) ) def view_choices(only_with_hidden = False): @@ -2512,8 +2511,6 @@ def should_show_command_form(datasource, ignore_display_option=False): return False if not config.may("general.act"): return False - if html.has_var("try"): - return False # What commands are available depends on the Livestatus table we # deal with. If a data source provides information about more diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 66ba942..080ddfb 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -559,7 +559,7 @@ def render_context_specs(visual, context_specs): spec.render_input(ident, value) def page_edit_visual(what, all_visuals, custom_field_handler = None, - create_handler = None, try_handler = None, + create_handler = None, load_handler = None, info_handler = None, sub_pages = []): visual_type = visual_types[what] @@ -717,7 +717,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, if html.var("save%d" % nr): save_and_go = pagename - if save_and_go or html.var("save") or html.var("try") or html.var("search"): + if save_and_go or html.var("save") or html.var("search"): try: general_properties = vs_general.from_html_vars('general') vs_general.validate_value(general_properties, 'general') @@ -805,25 +805,12 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, html.show_localization_hint() html.button("save", _("Save")) + for nr, (title, pagename, icon) in enumerate(sub_pages): html.button("save%d" % nr, _("Save and go to ") + title) - html.hidden_fields() - - if try_handler: - html.write(" ") - html.button("try", _("Try out")) - html.end_form() - - 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 - bi.reset_cache_status() - try_handler(visual) - return # avoid second html footer - else: - html.end_form() + html.hidden_fields() + html.end_form() html.footer() #.