Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: FIX: Made bulk inventory work in IE

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 682a661c5df6a75f56997bd531cd774669dde3e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=682a661c5df6a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 14:36:24 2011 +0200 FIX: Made bulk inventory work in IE --- .bugs/197 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/check_mk.css | 1 + web/htdocs/js/wato.js | 6 ++++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.bugs/197 b/.bugs/197 new file mode 100644 index 0000000..9c73aee --- /dev/null +++ b/.bugs/197 @@ -0,0 +1,15 @@ +Title: Dashlet iframe Hintergrund weiß +Component: multisite +Benefit: 3 +State: open +Cost: 2 +Date: 2011-08-26 14:24:58 +Class: nastiness + +Momentan ist der Dashlet Hintergrund bei iframes immer weiß. Das sieht nicht gut aus. +Die Idee scheint mir zu sein, dass jede eingebettete Seite einen Eigenen Hintergrund +definieren können soll. Ist grundsätzlich sicher auch sinnvoll. Allerdings sollte man +den Default Hintergrund der Multisite Seite immer als Fallback drin haben. + +Interessanterweise funktioniert es im Firefox ordentlich. Da muss man noch mal drüber +schauen. Eventuell irgendwas im CSS schief. diff --git a/ChangeLog b/ChangeLog index abe1d18..9860aee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * FIX: WATO filtered status GUIs did not update the title after changing the title of the file/folder in WATO * FIX: Removed new python syntax which is incompatible with old python versions + * FIX: Made bulk inventory work in IE * Views are not reloaded completely anymore. The data tables are reloaded on their own. * Open tabs in views do not prevent reloading the displayed data anymore diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index c5ac76d..11f60b7 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -2034,6 +2034,7 @@ table.add_snapin i { padding: 5px; height: 250px; overflow: auto; + text-align: left; } .wato table.progress td.log { diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 7e3d447..68e7e40 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -212,8 +212,10 @@ function update_progress_stats(header) { for(var i = 1; i < header.length; i++) { var o = document.getElementById('progress_stat' + (i - 1)); if (o) { - if(progress_success_stats.indexOf(i) !== -1) - progress_found += parseInt(header[i]); + for(var a = 0; a < progress_success_stats.length; a++) + if(progress_success_stats[a] == i) + progress_found += parseInt(header[i]); + o.innerHTML = parseInt(o.innerHTML) + parseInt(header[i]); o = null; }

13 years

Check_MK Git: check_mk: FIX: Fixed js errors in IE when having not enough space on dashboard

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8cebdd8fe5fed8c509fa72ba6cf7e5c9d4818c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8cebdd8fe5fed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 14:45:13 2011 +0200 FIX: Fixed js errors in IE when having not enough space on dashboard --- ChangeLog | 1 + web/htdocs/js/dashboard.js | 37 +++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9860aee..9810bdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ the title of the file/folder in WATO * FIX: Removed new python syntax which is incompatible with old python versions * FIX: Made bulk inventory work in IE + * FIX: Fixed js errors in IE when having not enough space on dashboard * Views are not reloaded completely anymore. The data tables are reloaded on their own. * Open tabs in views do not prevent reloading the displayed data anymore diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index adb8bb4..7d461fd 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -26,11 +26,12 @@ function resize_dashlets(id, code) { var resize_info = eval(code); + var oDash = null; for (var i in resize_info) { var dashlet = resize_info[i]; // check if dashlet has title and resize its width - var oDash = document.getElementById("dashlet_title_" + dashlet[0]); + oDash = document.getElementById("dashlet_title_" + dashlet[0]); if (oDash) { oDash.style.width = dashlet[3] + "px"; oDash.style.top = "-" + title_height + "px"; @@ -38,7 +39,7 @@ function resize_dashlets(id, code) } // resize outer div - var oDash = document.getElementById("dashlet_" + dashlet[0]); + oDash = document.getElementById("dashlet_" + dashlet[0]); oDash.style.position = 'absolute'; oDash.style.left = dashlet[1] + "px"; oDash.style.top = dashlet[2] + "px"; @@ -46,26 +47,30 @@ function resize_dashlets(id, code) oDash.style.height = dashlet[4] + "px"; // resize shadow images - var oDash = document.getElementById("dashadow_w_" + dashlet[0]); - if (oDash) + oDash = document.getElementById("dashadow_w_" + dashlet[0]); + if(oDash && dashlet[4] - 32 > 0) oDash.style.height = (dashlet[4] - 32) + "px"; - var oDash = document.getElementById("dashadow_e_" + dashlet[0]); - if (oDash) + oDash = document.getElementById("dashadow_e_" + dashlet[0]); + if (oDash && dashlet[4] - 32 > 0) oDash.style.height = (dashlet[4] - 32) + "px"; - var oDash = document.getElementById("dashadow_n_" + dashlet[0]); - if (oDash) + oDash = document.getElementById("dashadow_n_" + dashlet[0]); + if (oDash && dashlet[3] - 32 > 0) oDash.style.width = (dashlet[3] - 32) + "px"; - var oDash = document.getElementById("dashadow_s_" + dashlet[0]); - if (oDash) + oDash = document.getElementById("dashadow_s_" + dashlet[0]); + if (oDash && dashlet[3] - 32 > 0) oDash.style.width = (dashlet[3] - 32) + "px"; // resize content div - var oDash = document.getElementById("dashlet_inner_" + dashlet[0]); - oDash.style.position = 'absolute'; - oDash.style.left = dashlet_padding + "px"; - oDash.style.top = dashlet_padding + "px"; - oDash.style.width = (dashlet[3] - 2*dashlet_padding) + "px"; - oDash.style.height = (dashlet[4] - 2*dashlet_padding) + "px"; + oDash = document.getElementById("dashlet_inner_" + dashlet[0]); + if(oDash) { + oDash.style.position = 'absolute'; + oDash.style.left = dashlet_padding + "px"; + oDash.style.top = dashlet_padding + "px"; + if((dashlet[3] - 2*dashlet_padding) > 0) + oDash.style.width = (dashlet[3] - 2*dashlet_padding) + "px"; + if((dashlet[4] - 2*dashlet_padding) > 0) + oDash.style.height = (dashlet[4] - 2*dashlet_padding) + "px"; + } } oDash = null; }

13 years

Check_MK Git: check_mk: WATO: New api function to generate tuple paths from string paths

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 17437a139387f6b2d1d443375565a723dc41443a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17437a139387f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 12:21:10 2011 +0200 WATO: New api function to generate tuple paths from string paths --- web/htdocs/wato.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f4f0f3f..ec33a70 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3219,7 +3219,10 @@ class API: return folder["title"] else: return filename - + + # Creates a path tuple from string path + def make_path(self, pathname): + return make_path(pathname) # BELOW ARE PRIVATE HELPER FUNCTIONS

13 years

Check_MK Git: check_mk: Multisite: Sorting by joined columns is now possible

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d30eb1586a27bc010b7038cf7cdeaf5823b1d364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d30eb1586a27bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 10:55:16 2011 +0200 Multisite: Sorting by joined columns is now possible --- ChangeLog | 1 + web/htdocs/views.py | 74 ++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44f1a52..abe1d18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ on their own. * Open tabs in views do not prevent reloading the displayed data anymore * Added display_option "L" to enable/disable column title sortings + * Sorting by joined columns is now possible 1.1.11i3: Core, Setup, etc.: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index a792f67..862a8ab 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1163,7 +1163,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # [4] Sorting - use view sorters or url supplied sorters sorter_list = html.has_var('sort') and parse_url_sorters(html.var('sort')) or view["sorters"] - sorters = [ (multisite_sorters[sn], reverse) for sn, reverse in sorter_list ] + sorters = [ (multisite_sorters[s[0]],) + s[1:] for s in sorter_list ] # [5] Grouping group_painters = [ (multisite_painters[e[0]],) + e[1:] for e in view["group_painters"] ] @@ -1183,10 +1183,13 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru master_painters = [ p for p in all_painters if len(p) < 4 ] columns = get_needed_columns(master_painters) join_columns = get_needed_columns(join_painters) - - # Columns needed for sorters (what shall we do with the join columns?) - for s, r in sorters: - columns += s["columns"] + + # Columns needed for sorters + for s in sorters: + if len(s) == 2: + columns += s[0]["columns"] + else: + join_columns += s[0]["columns"] # Add key columns, needed for executing commands columns += datasource["keys"] @@ -1218,11 +1221,11 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru else: rows = query_data(datasource, columns, add_columns, query, only_sites, get_limit()) - sort_data(rows, sorters) - # Now add join information, if there are join columns if len(join_painters) > 0: do_table_join(datasource, rows, filterheaders, join_painters, join_columns, only_sites) + + sort_data(rows, sorters) else: rows = [] @@ -1690,13 +1693,23 @@ def merge_data(data, columns): # for same objects (e.g. host_name in table services and # simply name in table hosts) def sort_data(data, sorters): + if len(sorters) == 0: return - elif len(sorters) == 1: + + # Join the data in case of sorting with joined data + # FIXME: Problem: What to do in case of several joined + # columns of different services which use the same cols? + for row in data: + for s in sorters: + if len(s) > 2: + row.update(row.get("JOIN", {}).get(s[2], {})) + + if len(sorters) == 1: data.sort(sorters[0][0]["cmp"], None, sorters[0][1]) return - sort_cmps = [(s["cmp"], (reverse and -1 or 1)) for s, reverse in sorters] + sort_cmps = [(s[0]["cmp"], (s[1] and -1 or 1)) for s in sorters] def multisort(e1, e2): for func, neg in sort_cmps: @@ -2217,9 +2230,16 @@ def substract_sorters(base, remove): base.remove((s[0], not s[1])) def parse_url_sorters(sort): + sorters = [] if not sort: - return [] - return [ (s.replace('-', ''), s.startswith('-')) for s in sort.split(',') ] + return sorters + for s in sort.split(','): + if not '~' in s: + sorters.append((s.replace('-', ''), s.startswith('-'))) + else: + sorter, join_index = s.split('~', 1) + sorters.append((sorter.replace('-', ''), sorter.startswith('-'), join_index)) + return sorters def get_sorter_name_of_painter(painter): if 'sorter' in painter: @@ -2256,6 +2276,10 @@ def get_separated_sorters(view): return group_sort, user_sort, view_sort +def get_painter_join_index(view, painter): + for e in view["painters"]: + if e[0] == painter['name'] and len(e) >= 5: + return e[3] def sort_url(view, painter): """ @@ -2272,13 +2296,20 @@ def sort_url(view, painter): sorter = group_sort + user_sort + view_sort + # When painter is joined, then add the join index as 3rd attribute to tuple + join_index = get_painter_join_index(view, painter) + # Now apply the sorter of the current column: # - Negate/Disable when at first position # - Move to the first position when already in sorters # - Add in the front of the user sorters when not set sorter_name = get_sorter_name_of_painter(painter) - this_asc_sorter = (sorter_name, False) - this_desc_sorter = (sorter_name, True) + if join_index: + this_asc_sorter = (sorter_name, False, join_index) + this_desc_sorter = (sorter_name, True, join_index) + else: + this_asc_sorter = (sorter_name, False) + this_desc_sorter = (sorter_name, True) if user_sort and this_asc_sorter == user_sort[0]: # Second click: Change from asc to desc order @@ -2297,7 +2328,14 @@ def sort_url(view, painter): # Now add the sorter as primary user sorter sorter = group_sort + [this_asc_sorter] + user_sort + view_sort - return ','.join([ (s[1] and '-' or '') + s[0] for s in sorter ]) + p = [] + for s in sorter: + if len(s) == 2: + p.append((s[1] and '-' or '') + s[0]) + else: + p.append((s[1] and '-' or '') + s[0] + '~' + s[2]) + + return ','.join(p) def paint_header(view, p): painter = p[0] @@ -2379,16 +2417,16 @@ def cmp_insensitive_string(v1, v2): # Sorting def cmp_simple_string(column, r1, r2): - v1, v2 = r1[column], r2[column] + v1, v2 = r1.get(column, ''), r2.get(column, '') return cmp_insensitive_string(v1, v2) def cmp_string_list(column, r1, r2): - v1 = ''.join(r1[column]) - v2 = ''.join(r2[column]) + v1 = ''.join(r1.get(column, [])) + v2 = ''.join(r2.get(column, [])) return cmp_insensitive_string(v1, v2) def cmp_simple_number(column, r1, r2): - return cmp(r1[column], r2[column]) + return cmp(r1.get(column), r2.get(column)) def declare_simple_sorter(name, title, column, func): multisite_sorters[name] = {

13 years

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f26bf2acccf1301e3f52b9135fceed0f8f5c723 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f26bf2acccf13… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 10:54:33 2011 +0200 Updated bug entries --- .bugs/196 | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/.bugs/196 b/.bugs/196 new file mode 100644 index 0000000..c0697f0 --- /dev/null +++ b/.bugs/196 @@ -0,0 +1,21 @@ +Title: Gejointe Columns sortieren ist noch ein Hack +Component: multisite +Benefit: 5 +State: open +Cost: 3 +Date: 2011-08-26 10:49:22 +Class: nastiness + +Ich musste das sortieren der joined colums umsetzen. Das war gar nicht so trivial. +Als Hack habe ich es nun geschaft. Das offene Problem, welches noch existiert: + +Das Joinen der Columnns passiert für die gesamte Row. Das führt dazu, dass wenn man +mehrere Join Columns hat, die auf die gleiche Spalte von verschiedenen Services zugreifen, +diese sich gegenseitig überschreiben können. + +Das ist hier momentan tolerierbar, deswegen belasse ich es gerade mal dabei. + +Der richtige Weg wäre wohl die Row dann zu joinen, wenn man weiß um welche Column es geht. +Das Problem ist nur, dass man dies bei den Sortern momentan erst im Sorter selbst weiß. +Man müsste eine Wrapper Funktion dazwischen schieben, die den Join mit der jeweiligen Column +macht.

13 years

Check_MK Git: check_mk: Fixed javascript undefined var error

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08be2b0489eceb373a7d1d62e022aa8e03504c8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08be2b0489eceb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 16:19:46 2011 +0200 Fixed javascript undefined var error --- web/htdocs/js/hover.js | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/hover.js b/web/htdocs/js/hover.js index 85da1c8..319ae4d 100644 --- a/web/htdocs/js/hover.js +++ b/web/htdocs/js/hover.js @@ -56,14 +56,15 @@ function hoverOpen() { } function hoverHide() { - _hoverMenu.style.display = 'none'; - document.body.style.cursor = 'auto'; + if(hoverOpen()) { + _hoverMenu.style.display = 'none'; + document.body.style.cursor = 'auto'; + } } function hoverShow(x, y, code) { // Hide all other hover menus - if(hoverOpen()) - hoverHide(); + hoverHide(); var hoverSpacer = 5; var minWidth = 400;

13 years

Check_MK Git: check_mk: Fixed compatibility issues in multisite

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 278a4163ef7c329b14f597b8a62b9286b8b989c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=278a4163ef7c32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 13:22:35 2011 +0200 Fixed compatibility issues in multisite --- web/htdocs/views.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b47808b..a792f67 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2297,7 +2297,7 @@ def sort_url(view, painter): # Now add the sorter as primary user sorter sorter = group_sort + [this_asc_sorter] + user_sort + view_sort - return ','.join([ ('-' if s[1] else '') + s[0] for s in sorter ]) + return ','.join([ (s[1] and '-' or '') + s[0] for s in sorter ]) def paint_header(view, p): painter = p[0] @@ -2402,8 +2402,8 @@ def declare_1to1_sorter(painter_name, func, col_num = 0, reverse = False): "title" : multisite_painters[painter_name]['title'], "columns" : multisite_painters[painter_name]['columns'], "cmp" : lambda r1, r2: func(multisite_painters[painter_name]['columns'][col_num], - r1 if reverse else r2, - r2 if reverse else r1) + reverse and r1 or r2, + reverse and r2 or r1) } return painter_name

13 years

Check_MK Git: check_mk: Fixed another merge problem; Reapplied fix

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 310f037014371adb0c5fcc06348a4b9f8572051d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=310f037014371a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 13:10:35 2011 +0200 Fixed another merge problem; Reapplied fix --- web/htdocs/views.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 79d4049..b47808b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1162,7 +1162,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru query = filterheaders + view.get("add_headers", "") # [4] Sorting - use view sorters or url supplied sorters - sorter_list = parse_url_sorters(html.var('sort')) if html.has_var('sort') else view["sorters"] + sorter_list = html.has_var('sort') and parse_url_sorters(html.var('sort')) or view["sorters"] sorters = [ (multisite_sorters[sn], reverse) for sn, reverse in sorter_list ] # [5] Grouping

13 years

Check_MK Git: check_mk: Added display_option "L" to enable/ disable column title sortings

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 55312accd136dbc296ec61188279ba7a0fdb005d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55312accd136db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 11:30:49 2011 +0200 Added display_option "L" to enable/disable column title sortings --- ChangeLog | 1 + web/htdocs/dashboard.py | 2 +- web/htdocs/views.py | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99db10a..44f1a52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * Views are not reloaded completely anymore. The data tables are reloaded on their own. * Open tabs in views do not prevent reloading the displayed data anymore + * Added display_option "L" to enable/disable column title sortings 1.1.11i3: Core, Setup, etc.: diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index f3fce81..ba91148 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -182,7 +182,7 @@ 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=SIXHR&_body_class=dashlet" % dashlet["view"] + dashlet["iframe"] = "view.py?view_name=%s&display_options=SIXHRL&_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. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 56efde2..79d4049 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1059,7 +1059,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 = "HTBFCEOZRSIXDM" + all_display_options = "HTBFCEOZRSIXDML" # Parse display options and if html.output_format == "html": @@ -2315,7 +2315,9 @@ def paint_header(view, p): # - Add the display options (Keeping the same display options as current) # - Link to _self (Always link to the current frame) # - Keep the _body_class variable (e.g. for dashlets) - if view.get('user_sortable', True) and get_sorter_name_of_painter(painter) is not None: + if 'L' in html.display_options \ + and view.get('user_sortable', True) \ + and get_sorter_name_of_painter(painter) is not None: params = [ ('sort', sort_url(view, painter)), ]

13 years

Check_MK Git: check_mk: Showing reload error only once

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d420b7b6fe9c15f93a8e2422873a2aa1e1ad634a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d420b7b6fe9c15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 11:10:02 2011 +0200 Showing reload error only once --- web/htdocs/js/check_mk.js | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index b8d8baa..0e7a1ec 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -620,7 +620,9 @@ function updateHeaderTime() { oTime = null; } +var g_reload_error = false; function handleContentReload(_unused, code) { + g_reload_error = false; var o = document.getElementById('data_container'); o.innerHTML = code; executeJS('data_container'); @@ -634,10 +636,13 @@ function handleContentReload(_unused, code) { } function handleContentReloadError(data, statusCode) { - var o = document.getElementById('data_container'); - o.innerHTML = '<div class=error>Update failed (' + statusCode - + '). The shown data might be outdated</div>' + o.innerHTML; - o = null; + if(!g_reload_error) { + var o = document.getElementById('data_container'); + o.innerHTML = '<div class=error>Update failed (' + statusCode + + '). The shown data might be outdated</div>' + o.innerHTML; + o = null; + g_reload_error = true; + } // Continue update after the error startReloadTimer('');

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits