[checkmk-commits] Check_MK Git: check_mk: Added display_option "w" to disable limit messages and livestatus errors in views

Module: check_mk Branch: master Commit: 7780c66c65fc5212cbb7ba6259e9f1268965ac95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7780c66c65fc52… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Sep 8 15:07:18 2011 +0200 Added display_option "w" to disable limit messages and livestatus errors in views --- ChangeLog | 1 + web/htdocs/dashboard.py | 4 ++-- web/htdocs/views.py | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26edad9..f7c6aa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Multisite: * FIX: fix rescheduling of host check * Added some missing i18n strings in general HTML functions + * Added display_option "w" to disable limit messages and livestatus errors in views 1.1.11i4: Core, Setup, etc.: diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index ba91148..e155829 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -182,8 +182,8 @@ def render_dashlet(nr, dashlet, filename): # The method "view" is a shortcut for "iframe" with a certain url if "view" in dashlet: - dashlet["iframe"] = "view.py?view_name=%s&display_options=SIXHRL&_body_class=dashlet" % dashlet["view"] - + dashlet["iframe"] = "view.py?view_name=%s&display_options=SIXHRLw&_body_class=dashlet" % dashlet["view"] + # The content is rendered only if it is fixed. In the # other cases the initial (re)-size will paint the content. if "content" in dashlet: # fixed content diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f7ca622..abf7518 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1067,7 +1067,7 @@ def get_needed_columns(painters): # Display view with real data. This is *the* function everying # is about. def show_view(view, show_heading = False, show_buttons = True, show_footer = True): - all_display_options = "HTBFCEOZRSIXDML" + all_display_options = "HTBFCEOZRSIXDMLW" # Parse display options and if html.output_format == "html": @@ -1390,8 +1390,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if not has_done_actions: # Limit exceeded? Show warning - html.check_limit(rows, get_limit()) - layout["render"](rows, view, group_painters, painters, num_columns, + if 'W' in display_options: + html.check_limit(rows, get_limit()) + layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes and not html.do_actions()) # Play alarm sounds, if critical events have been displayed @@ -1401,7 +1402,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # In multi site setups error messages of single sites do not block the # output and raise now exception. We simply print error messages here. # In case of the web service we show errors only on single site installations. - if config.show_livestatus_errors and (html.output_format == "html" or not config.is_multisite()): + if config.show_livestatus_errors \ + and 'W' in display_options \ + and (html.output_format == "html" or not config.is_multisite()): for sitename, info in html.live.deadsites.items(): html.show_error("<b>%s - Livestatus error</b><br>%s" % (info["site"]["alias"], info["exception"]))