[checkmk-commits] Check_MK Git: check_mk: Also suppressing warning messages during page reloads when set via display options

Module: check_mk Branch: master Commit: 9fb8a9a4886721bd89b174516e3bba8e0ad2b24f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fb8a9a4886721… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Sep 9 09:45:22 2011 +0200 Also suppressing warning messages during page reloads when set via display options --- web/htdocs/js/check_mk.js | 2 +- web/htdocs/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 76d2fb6..0439168 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -713,7 +713,7 @@ function handleReload(url) { } else { // Enforce specific display_options to get only the content data var display_options = getUrlParam('display_options'); - var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r' ]; + var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r', 'w' ]; for(var i = 0; i < opts.length; i++) { if(display_options.indexOf(opts[i].toUpperCase()) > -1) display_options = display_options.replace(opts[i].toUpperCase(), opts[i]); diff --git a/web/htdocs/views.py b/web/htdocs/views.py index abf7518..7147b0f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1675,7 +1675,7 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l html.live.set_prepend_site(True) if limit != None: html.live.set_limit(limit + 1) # + 1: We need to know, if limit is exceeded - if config.debug and html.output_format == "html": + if config.debug and html.output_format == "html" and 'W' in html.display_options: html.write("<div class=message><tt>%s</tt></div>\n" % (query.replace('\n', '<br>\n'))) if only_sites: