[checkmk-commits] Cleaned up garbled HTML code after view dashlet reload

Module: check_mk Branch: master Commit: 7f45bcc0df64f075e7bb27eece5a0daec22c1419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f45bcc0df64f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 2 16:20:56 2015 +0100 Cleaned up garbled HTML code after view dashlet reload --- web/htdocs/js/checkmk.js | 8 ++++++-- web/plugins/dashboard/dashlets.py | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index efd7095..8b0bcab 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1068,7 +1068,7 @@ function do_reload(url) // Enforce specific display_options to get only the content data. // All options in "opts" will be forced. Existing upper-case options will be switched. var display_options = getUrlParam('display_options'); - // Removed 'w' to reflect original rengering mechanism during reload + // Removed 'w' to reflect original rendering mechanism during reload // For example show the "Your query produced more than 1000 results." message // in views even during reload. var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r', 'u' ]; @@ -1091,7 +1091,11 @@ function do_reload(url) if(real_display_options !== '') params['display_options'] = real_display_options; - params['_do_actions'] = getUrlParam('_do_actions') + params['_do_actions'] = getUrlParam('_do_actions'); + + // For dashlet reloads add a parameter to mark this request as reload + if (window.location.href.indexOf("dashboard_dashlet.py") != -1) + params["_reload"] = "1"; call_ajax(makeuri(params), { response_handler : handle_content_reload, diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 660aa89..4b62454 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -590,8 +590,14 @@ def dashlet_view(nr, dashlet): import bi # FIXME: Cleanup? bi.reset_cache_status() # needed for status icon - html.set_var('display_options', 'HRSIXL') - html.set_var('_display_options', 'HRSIXL') + is_reload = html.has_var("_reload") + + display_options = "SIXL" + if not is_reload: + display_options += "HR" + + html.set_var('display_options', display_options) + html.set_var('_display_options', display_options) html.add_body_css_class('dashlet') import views # FIXME: HACK, clean this up somehow