Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: Next step to make row selections working again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 26f402a63c0399b80f547001a1c711aa5efc2dc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26f402a63c0399… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 17:44:18 2011 +0200 Next step to make row selections working again --- web/htdocs/js/check_mk.js | 242 ++++++++++++++++++++++++++++-------------- web/plugins/views/layouts.py | 2 +- 2 files changed, 164 insertions(+), 80 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26f402a63c…

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7087e493b72e2d1466978691c4658092a9aaf9d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7087e493b72e2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 17:46:13 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: web/plugins/views/layouts.py ---

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd9dbec5c998a08f3c4c941f551fa3f909a04901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd9dbec5c998a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 17:46:19 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Show only selected rows during action

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a26176762457c825eee8f3e23f2503b959d50479 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a26176762457c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 17:46:12 2011 +0200 Show only selected rows during action --- web/htdocs/views.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e75f778..27c3205 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1359,6 +1359,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Create URI with all actions variables removed backurl = html.makeuri([]) has_done_actions = do_actions(view, datasource["infos"][0], rows, backurl) + if type(has_done_actions) == list: + rows = has_done_actions + has_done_actions = False if 'C' in display_options: html.write("</td></tr>") except MKUserError, e: @@ -2170,6 +2173,11 @@ def nagios_host_service_action_command(what, dataset): nagios_command = ("[%d] " % int(time.time())) + command + "\n" return title, [nagios_command] + +# Returns: +# True -> Actions have been done +# False -> No actions done because now rows selected +# [...] new rows -> Rows actions (shall/have) be performed on def do_actions(view, what, rows, backurl): if not config.may("act"): html.show_error(_("You are not allowed to perform actions. If you think this is an error, " @@ -2194,7 +2202,7 @@ def do_actions(view, what, rows, backurl): title = nagios_action_command(what, action_rows[0])[0] # just get the title if not html.confirm(_("Do you really want to %s the following %d %ss?") % (title, len(action_rows), what)): - return False # no actions done + return action_rows # no actions done, but show only selected rows count = 0 for row in action_rows:

13 years

Check_MK Git: check_mk: Open Command tab if checkboxes are shown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c5164c9ddac6bb182eefbd7fe13501d17c34c48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c5164c9ddac6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 17:41:43 2011 +0200 Open Command tab if checkboxes are shown --- web/htdocs/views.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b3cc56d..e75f778 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1270,20 +1270,20 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if need_navi: html.write("<table class=navi><tr>\n") + # Painter-Options + if 'D' in display_options and len(painter_options) > 0 and config.may("painter_options"): + toggle_button("painter_options", False, _("Display")) + html.write("<td class=minigap></td>\n") + # Filter-button if 'F' in display_options and len(show_filters) > 0: filter_isopen = html.var("search", "") == "" and view["mustsearch"] toggle_button("table_filter", filter_isopen, _("Filter"), ["filter"]) html.write("<td class=minigap></td>\n") - # Command-button + # Command-button, open command form if checkboxes are currently shown if 'C' in display_options and len(rows) > 0 and config.may("act"): - toggle_button("table_actions", False, _("Commands")) - html.write("<td class=minigap></td>\n") - - # Painter-Options - if 'D' in display_options and len(painter_options) > 0 and config.may("painter_options"): - toggle_button("painter_options", False, _("Display")) + toggle_button("table_actions", show_checkboxes, _("Commands")) html.write("<td class=minigap></td>\n") # Buttons for view options @@ -1369,8 +1369,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if 'C' in display_options: show_action_form(True, datasource) - elif 'C' in display_options: - show_action_form(False, datasource) + elif 'C' in display_options: # (display open, if checkboxes are currently shown) + show_action_form(show_checkboxes, datasource) if need_navi: if 'O' in display_options and len(painter_options) > 0 and config.may("painter_options"):

13 years

Check_MK Git: check_mk: Do not display any tabs during command confirmation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96d2defbe8ddf3526701b1683c6162a22f20c979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96d2defbe8ddf3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 17:38:02 2011 +0200 Do not display any tabs during command confirmation --- web/htdocs/views.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8d64461..b3cc56d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1260,7 +1260,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if show_buttons and 'B' in display_options: show_context_links(view, hide_filters) - need_navi = show_buttons and ( + need_navi = show_buttons and \ + not html.do_actions() and ( 'D' in display_options or 'F' in display_options or 'C' in display_options or @@ -1270,13 +1271,13 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru html.write("<table class=navi><tr>\n") # Filter-button - if 'F' in display_options and len(show_filters) > 0 and not html.do_actions(): + if 'F' in display_options and len(show_filters) > 0: filter_isopen = html.var("search", "") == "" and view["mustsearch"] toggle_button("table_filter", filter_isopen, _("Filter"), ["filter"]) html.write("<td class=minigap></td>\n") # Command-button - if 'C' in display_options and len(rows) > 0 and config.may("act") and not html.do_actions(): + if 'C' in display_options and len(rows) > 0 and config.may("act"): toggle_button("table_actions", False, _("Commands")) html.write("<td class=minigap></td>\n") @@ -1288,7 +1289,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Buttons for view options if 'O' in display_options: # Link for selecting/deselecting all rows - if 'C' in display_options and config.may("act") and not html.do_actions() and layout["checkboxes"]: + if 'C' in display_options and config.may("act") and layout["checkboxes"]: if show_checkboxes: addclass = " selected" title = _("Hide check boxes") @@ -1346,7 +1347,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru html.write("</table><table class=navi><tr>\n") # Filter form - if 'F' in display_options and len(show_filters) > 0 and not html.do_actions(): + if 'F' in display_options and len(show_filters) > 0: show_filter_form(filter_isopen, show_filters) # Actions @@ -2176,7 +2177,7 @@ def do_actions(view, what, rows, backurl): return False # no actions done # Handle optional row filter based on row selections - if html.var('selected_rows', '') != '': + if html.has_var('selected_rows'): selected_rows = html.var('selected_rows') action_rows = [] for row in rows:

13 years

Check_MK Git: check_mk: Suppress Checkboxes in single layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8cbe1b99baeec582c6f7f419e5567c28d9df437f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cbe1b99baeec5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 16:47:47 2011 +0200 Suppress Checkboxes in single layout --- web/htdocs/views.py | 2 +- web/plugins/views/layouts.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 01dcf17..8d64461 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1288,7 +1288,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Buttons for view options if 'O' in display_options: # Link for selecting/deselecting all rows - if 'C' in display_options and config.may("act") and not html.do_actions(): + if 'C' in display_options and config.may("act") and not html.do_actions() and layout["checkboxes"]: if show_checkboxes: addclass = " selected" title = _("Hide check boxes") diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index a174a01..d9c4989 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -77,7 +77,8 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig multisite_layouts["dataset"] = { "title" : _("Single dataset"), "render" : render_single_dataset, - "group" : False + "group" : False, + "checkboxes" : False, } # ------------------------------------------------------------------------- @@ -202,7 +203,8 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show multisite_layouts["boxed"] = { "title" : _("Balanced boxes"), "render" : render_grouped_boxes, - "group" : True + "group" : True, + "checkboxes" : True, } # ------------------------------------------------------------------------- @@ -292,7 +294,9 @@ multisite_layouts["tiled"] = { "title" : _("Tiles"), "render" : render_tiled, "group" : True, + "checkboxes" : True, } + # ------------------------------------------------------------------------- # _____ _ _ # |_ _|_ _| |__ | | ___ @@ -434,4 +438,5 @@ multisite_layouts["table"] = { "title" : _("Table"), "render" : render_grouped_list, "group" : True, + "checkboxes" : True, }

13 years

Check_MK Git: check_mk: Multisite: Add Checkboxes to tiled/boxed layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1e398f2569178e0e1077ecc842b1988b3bbdf6c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e398f2569178e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 16:42:06 2011 +0200 Multisite: Add Checkboxes to tiled/boxed layout --- web/plugins/views/layouts.py | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index fdf7b26..a174a01 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -30,6 +30,16 @@ def init_rowselect(): return html.init_rowselect() +def render_checkbox(view, row, num_tds): + # value contains the number of columns of this datarow. This is + # needed for hiliting the correct number of TDs + html.write("<input type=checkbox name=\"%s\" value=%d />" % (row_id(view, row), num_tds)) + +def render_checkbox_td(view, row, num_tds): + html.write("<td class=checkbox>") + render_checkbox(view, row, num_tds) + html.write("</td>") + # ------------------------------------------------------------------------- # ____ _ _ # / ___|(_)_ __ __ _| | ___ @@ -142,6 +152,8 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show # paint table headers, if configured if paintheader: html.write("<tr>") + if show_checkboxes: + html.write("<th></th>") for p in painters: paint_header(view, p) html.write("\n") @@ -159,8 +171,10 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show state = row.get("host_state", 0) if state > 0: state +=1 # 1 is critical for hosts html.write('<tr class="data %s%d">' % (trclass, state)) + if show_checkboxes: + render_checkbox_td(view, row, len(painters)) for p in painters: - paint(p, row, index) + paint(p, row) html.write("</tr>\n") html.write("</table></div>\n") @@ -199,7 +213,7 @@ multisite_layouts["boxed"] = { # |_| |_|_|\___|\__,_| # # ------------------------------------------------------------------------- -def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, _ignore_show_checkboxes): +def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, show_checkboxes): html.write("<table class=\"data tiled\">\n") last_group = None @@ -255,8 +269,11 @@ def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, _ign rendered = [ ("", prepare_paint(p, row)[1]) for p in painters ] - html.write("<tr><td class=\"tl %s\">%s</td><td class=\"tr %s\">%s</td></tr>\n" % \ - (rendered[1][0], rendered[1][1], rendered[2][0], rendered[2][1])) + html.write("<tr><td class=\"tl %s\">" % (rendered[1][0],)) + if show_checkboxes: + render_checkbox(view, row, len(painters) - 1) + html.write("%s</td><td class=\"tr %s\">%s</td></tr>\n" % \ + (rendered[1][1], rendered[2][0], rendered[2][1])) html.write("<tr><td colspan=2 class=\"center %s\">%s</td></tr>\n" % \ (rendered[0][0], rendered[0][1])) for css, cont in rendered[5:]: @@ -396,11 +413,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ html.write('<tr class="data %s%d">' % (trclass, state)) if show_checkboxes: - html.write("<td class=checkbox>") - # value contains the number of columns of this datarow - html.write("<input type=checkbox name=\"%s\" value=%d />" % - (row_id(view, row), num_painters - 1)) - html.write("</td>") + render_checkbox_td(view, row, num_painters - 1) for p in painters: paint(p, row) column += 1

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6074f1e81f81117189d75f8bd0fb758fb2f9472c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6074f1e81f8111… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 16:30:17 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Changed checkbox ids

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 080a171bde35e5fdaac1e0ef316d84d02fbe6807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=080a171bde35e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 16:30:02 2011 +0200 Changed checkbox ids --- web/htdocs/views.py | 7 +++---- web/plugins/views/layouts.py | 6 ++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d2d8614..51b6ee2 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2280,11 +2280,10 @@ def row_id(view, row): key += '~%s' % row[col] return str(hash(key)) -def paint(p, row, rid = None): +def paint(p, row): tdclass, content = prepare_paint(p, row) - row_classes = rid is not None and 'dr_%s dr ' % rid or '' - if tdclass or row_classes: - html.write("<td class=\"%s%s\">%s</td>\n" % (row_classes or '', tdclass or '', content)) + if tdclass: + html.write("<td class=\"%s\">%s</td>\n" % (tdclass, content)) else: html.write("<td>%s</td>" % content) return content != "" diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 09834cb..fdf7b26 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -397,10 +397,12 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ if show_checkboxes: html.write("<td class=checkbox>") - html.write("<input type=checkbox name=\"172377356\" title=lars hirnibaldi=77 width=88>") + # value contains the number of columns of this datarow + html.write("<input type=checkbox name=\"%s\" value=%d />" % + (row_id(view, row), num_painters - 1)) html.write("</td>") for p in painters: - paint(p, row, row_id(view, row)) + paint(p, row) column += 1 index += 1

13 years

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011