Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Fixed several "back" button navigation issues in dashboard editor

by Lars Michelsen

Module: check_mk Branch: master Commit: bd23966d62fa9242f55ab60340a26db2c5eecb35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd23966d62fa92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 09:02:47 2014 +0200 Fixed several "back" button navigation issues in dashboard editor --- .bugs/2192 | 7 +++++-- web/htdocs/dashboard.py | 11 +++++++---- web/htdocs/views.py | 2 +- web/plugins/dashboard/dashlets.py | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.bugs/2192 b/.bugs/2192 index b163378..5df5f1d 100644 --- a/.bugs/2192 +++ b/.bugs/2192 @@ -1,11 +1,14 @@ Title: Dashboard: Back button (abort) while adding view to dashboard leads away Component: multisite -State: open +Class: bug +State: done Date: 2014-10-06 18:38:23 Targetversion: future -Class: bug When you add a view to a dashboard, and in the process press "Back", then you do not get back but to the list of views. Solution: Either remove the button or make it work as expected. + +2014-10-07 09:02:32: changed state open -> done +Done. diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 7ac8255..abf730a 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -388,7 +388,8 @@ def render_dashboard(name): add_existing_view_type = dashlet_types['view'].copy() add_existing_view_type['title'] = _('Existing View') - add_existing_view_type['add_urlfunc'] = lambda: 'create_view_dashlet.py?name=%s&create=0' % html.urlencode(name) + add_existing_view_type['add_urlfunc'] = lambda: 'create_view_dashlet.py?name=%s&create=0&back=%s' % \ + (html.urlencode(name), html.urlencode(html.makeuri([('edit', '1')]))) choices = [ ('view', add_existing_view_type) ] choices += sorted(dashlet_types.items(), key = lambda x: x[1].get('sort_index', 0)) @@ -679,9 +680,10 @@ def page_create_view_dashlet(): if create: import views + # %s can not be added using html.makeuri(), replaced with datasource later url = html.makeuri([], filename = "create_view_dashlet_infos.py") - url += '&datasource=%s' # %s can not be added using html.makeuri() - # Note: %s will later be replaced by datasource + url += '&datasource=%s' + views.page_create_view(next_url=url) else: @@ -710,7 +712,8 @@ def choose_view(name): html.header(_('Create Dashlet from existing View'), stylesheets=["pages"]) html.begin_context_buttons() - html.context_button(_("Back"), html.makeuri([('edit', 1)], filename = "dashboard.py"), "back") + back_url = html.var("back", "dashboard.py?edit=1&name=%s" % html.urlencode(html.var('name'))) + html.context_button(_("Back"), back_url, "back") html.end_context_buttons() if html.var('save') and html.check_transaction(): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 34b6d4c..a646a88 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -207,6 +207,7 @@ def page_edit_views(): # Create datasource selection valuespec, also for other modules def DatasourceSelection(): + # FIXME: Sort the datasources by (assumed) common usage datasources = [] for ds_name, ds in multisite_datasources.items(): datasources.append((ds_name, ds['title'])) @@ -222,7 +223,6 @@ def DatasourceSelection(): def page_create_view(next_url = None): - # FIXME: Sort the datasources by (assumed) common usage vs_ds = DatasourceSelection() ds = 'services' # Default selection diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 4be7271..554445a 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -525,7 +525,8 @@ def dashlet_view(nr, params): views.show_view(params, True, True, True) def dashlet_view_add_url(): - return 'create_view_dashlet.py?name=%s' % html.urlencode(html.var('name')) + return 'create_view_dashlet.py?name=%s&back=%s' % \ + (html.urlencode(html.var('name')), html.urlencode(html.makeuri([('edit', '1')]))) def dashlet_view_parameters(): return dashlet_view_render_input, dashlet_view_handle_input

9 years, 8 months

Check_MK Git: check_mk: Back URLs of edit dashlet or delete dashlet confirm dialog bring users back to edit mode of dashboard

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fc2de8bcd81d7646b8705232834d80b802f4b07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc2de8bcd81d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 08:45:22 2014 +0200 Back URLs of edit dashlet or delete dashlet confirm dialog bring users back to edit mode of dashboard --- web/htdocs/dashboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c60628c..7ac8255 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -442,7 +442,7 @@ window.onresize = function () { calculate_dashboard(); } dashboard_scheduler(1); """ % (MAX, GROW, raster, header_height, screen_margin, title_height, dashlet_padding, dashlet_min_size, corner_overlap, refresh_dashlets, ','.join(on_resize), name, board['mtime'], - html.makeuri([]), repr(dashlets_js))) + html.makeuri([('edit', '1')]), repr(dashlets_js))) if mode == 'edit': html.javascript('toggle_dashboard_edit(true)')

9 years, 8 months

Check_MK Git: check_mk: forms: helper function for editing severals dicts at once

by Mathias Kettner

Module: check_mk Branch: master Commit: e018c2929c47432e36f13e7cb07a05ac4eb082bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e018c2929c4743… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 08:56:32 2014 +0200 forms: helper function for editing severals dicts at once --- web/htdocs/forms.py | 72 +++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 225ba3c..b305f42 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. from lib import * +from valuespec import * # A input function with the same call syntax as htmllib.textinput() def input(valuespec, varprefix, defvalue): @@ -40,34 +41,42 @@ def get_input(valuespec, varprefix): return value +def edit_dictionary(entries, value, **args): + return edit_dictionaries( + [ ("value", Dictionary(title=title, elements=entries)) ], + { "value" : value }, + **args) -# preview = True: Do not output error messages, do not consume -# current transaction. This is for preview mode -def edit_dictionary(entries, value, focus=None, hover_help=True, +# Edit a dictionary with several sub-dictionaries +def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, validate=None, buttontext=None, title=None, buttons = None, method="GET", preview=False, varprefix="", formname="form", consume_transid = True): + new_value = value.copy() if html.var("filled_in") == formname and html.transaction_valid(): if not preview and consume_transid: html.check_transaction() messages = [] - for name, vs in entries: - try: - v = vs.from_html_vars(varprefix + name) - vs.validate_value(v, varprefix + name) - new_value[name] = v - except MKUserError, e: - messages.append("%s: %s" % (vs.title(), e.message)) - html.add_user_error(e.varname, e.message) - - if validate and not html.has_user_errors(): - try: - validate(new_value) - except MKUserError, e: - messages.append(e.message) - html.add_user_error(e.varname, e.message) + for keyname, dictionary in dictionaries: + new_value[keyname] = {} + entries = dictionary._elements + for name, vs in entries: + try: + v = vs.from_html_vars(keyname + "_" + varprefix + name) + vs.validate_value(v, keyname + "_" + varprefix + name) + new_value[keyname][name] = v + except MKUserError, e: + messages.append("%s: %s" % (vs.title(), e.message)) + html.add_user_error(e.varname, e.message) + + if validate and not html.has_user_errors(): + try: + validate(new_value[keyname]) + except MKUserError, e: + messages.append(e.message) + html.add_user_error(e.varname, e.message) if messages: if not preview: @@ -79,19 +88,20 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, html.begin_form(formname, method=method) - header(title and title or _("Properties")) - first = True - for name, vs in entries: - section(vs.title()) - html.help(vs.help()) - if name in value: - v = value[name] - else: - v = vs.default_value() - vs.render_input(varprefix + name, v) - if (not focus and first) or (name == focus): - vs.set_focus(varprefix + name) - first = False + for keyname, dictionary in dictionaries: + header(dictionary.title()) + first = True + for name, vs in dictionary._elements: + section(vs.title()) + html.help(vs.help()) + if name in value: + v = value[name] + else: + v = vs.default_value() + vs.render_input(keyname + "_" + varprefix + name, v) + if (not focus and first) or (name == focus): + vs.set_focus(keyname + "_" + varprefix + name) + first = False end() if buttons:

9 years, 8 months

Check_MK Git: check_mk: views: can now edit views without there general properties

by Mathias Kettner

Module: check_mk Branch: master Commit: bb46a996a3e92bc6c2c1b02bd70d6ccf0f164118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb46a996a3e92b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 7 08:57:06 2014 +0200 views: can now edit views without there general properties --- .bugs/2196 | 8 +++ web/htdocs/views.py | 165 ++++++++++++++++++++++++++------------------------- 2 files changed, 92 insertions(+), 81 deletions(-) diff --git a/.bugs/2196 b/.bugs/2196 new file mode 100644 index 0000000..7b3a379 --- /dev/null +++ b/.bugs/2196 @@ -0,0 +1,8 @@ +Title: Dashboard: "Show this view in the mobile GUI" does not make sense +Component: multisite +State: open +Date: 2014-10-06 19:12:23 +Targetversion: future +Class: nastiness + +This checkbox does not make any sense when a view is an embedded dashlet. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 34b6d4c..0b44123 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -206,6 +206,7 @@ def page_edit_views(): # First step: Select the data source # Create datasource selection valuespec, also for other modules +# FIXME: Sort the datasources by (assumed) common usage def DatasourceSelection(): datasources = [] for ds_name, ds in multisite_datasources.items(): @@ -222,7 +223,6 @@ def DatasourceSelection(): def page_create_view(next_url = None): - # FIXME: Sort the datasources by (assumed) common usage vs_ds = DatasourceSelection() ds = 'services' # Default selection @@ -324,86 +324,58 @@ def view_editor_options(): # % docu_link("multisite_sounds", _("documentation"))) ] -def view_editor_specs(ds_name): +def view_editor_specs(ds_name, general_properties=True): + load_views() # make sure that available_views is present specs = [] - specs.append( - ('view', Dictionary( - title = _('View Properties'), - render = 'form', - optional_keys = None, - elements = [ - ('datasource', FixedValue(ds_name, - title = _('Datasource'), - totext = multisite_datasources[ds_name]['title'], - help = _('The datasource of a view cannot be changed.'), - )), - ('options', ListChoice( - title = _('Options'), - choices = view_editor_options(), - default_value = ['user_sortable'], - )), - ('browser_reload', Integer( - title = _('Automatic page reload'), - unit = _('seconds'), - minvalue = 0, - help = _('Leave this empty or at 0 for no automatic reload.'), - )), - ('layout', DropdownChoice( - title = _('Basic Layout'), - choices = [ (k, v["title"]) for k,v in multisite_layouts.items() if not v.get("hide")], - default_value = 'table', - sorted = True, - )), - ('num_columns', Integer( - title = _('Number of Columns'), - default_value = 1, - minvalue = 1, - maxvalue = 50, - )), - ('column_headers', DropdownChoice( - title = _('Column Headers'), - choices = [ - ("off", _("off")), - ("pergroup", _("once per group")), - ("repeat", _("repeat every 20'th row")), - ], - default_value = 'pergroup', - )), - ], - )) - ) + if general_properties: + specs.append( + ('view', Dictionary( + title = _('View Properties'), + render = 'form', + optional_keys = None, + elements = [ + ('datasource', FixedValue(ds_name, + title = _('Datasource'), + totext = multisite_datasources[ds_name]['title'], + help = _('The datasource of a view cannot be changed.'), + )), + ('options', ListChoice( + title = _('Options'), + choices = view_editor_options(), + default_value = ['user_sortable'], + )), + ('browser_reload', Integer( + title = _('Automatic page reload'), + unit = _('seconds'), + minvalue = 0, + help = _('Leave this empty or at 0 for no automatic reload.'), + )), + ('layout', DropdownChoice( + title = _('Basic Layout'), + choices = [ (k, v["title"]) for k,v in multisite_layouts.items() if not v.get("hide")], + default_value = 'table', + sorted = True, + )), + ('num_columns', Integer( + title = _('Number of Columns'), + default_value = 1, + minvalue = 1, + maxvalue = 50, + )), + ('column_headers', DropdownChoice( + title = _('Column Headers'), + choices = [ + ("off", _("off")), + ("pergroup", _("once per group")), + ("repeat", _("repeat every 20'th row")), + ], + default_value = 'pergroup', + )), + ], + )) + ) - # [4] Sorting allowed = allowed_for_datasource(multisite_sorters, ds_name) - specs.append( - ('sorting', Dictionary( - title = _('Sorting'), - render = 'form', - optional_keys = None, - elements = [ - ('sorters', ListOf( - Tuple( - elements = [ - DropdownChoice( - title = _('Column'), - choices = [ (name, p["title"]) for name, p in allowed.items() ], - sorted = True, - no_preselect = True, - ), - DropdownChoice( - title = _('Order'), - choices = [(False, _("Ascending")), - (True, _("Descending"))], - ), - ], - orientation = 'horizontal', - ), - title = _('Sorting'), - add_label = _('Add column'), - )), - ], - )), - ) def column_spec(ident, title, ds_name): allowed = allowed_for_datasource(multisite_painters, ds_name) @@ -490,12 +462,43 @@ def view_editor_specs(ds_name): ], )) - specs.append(column_spec('grouping', _('Grouping'), ds_name)) specs.append(column_spec('columns', _('Columns'), ds_name)) + specs.append( + ('sorting', Dictionary( + title = _('Sorting'), + render = 'form', + optional_keys = None, + elements = [ + ('sorters', ListOf( + Tuple( + elements = [ + DropdownChoice( + title = _('Column'), + choices = [ (name, p["title"]) for name, p in allowed.items() ], + sorted = True, + no_preselect = True, + ), + DropdownChoice( + title = _('Order'), + choices = [(False, _("Ascending")), + (True, _("Descending"))], + ), + ], + orientation = 'horizontal', + ), + title = _('Sorting'), + add_label = _('Add column'), + )), + ], + )), + ) + + specs.append(column_spec('grouping', _('Grouping'), ds_name)) + return specs -def render_view_config(view): +def render_view_config(view, general_properties=True): ds_name = view.get("datasource", html.var("datasource")) if not ds_name: raise MKInternalError(_("No datasource defined.")) @@ -504,7 +507,7 @@ def render_view_config(view): view['datasource'] = ds_name - for ident, vs in view_editor_specs(ds_name): + for ident, vs in view_editor_specs(ds_name, general_properties): vs.render_input(ident, view) # Is used to change the view structure to be compatible to the valuespec

9 years, 8 months

Check_MK Git: check_mk: Fixed problem saving/ loading favorites after yesterdays changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f414b9a61faa8f9184d059b21c36ae49ed034b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f414b9a61faa8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 7 08:31:27 2014 +0200 Fixed problem saving/loading favorites after yesterdays changes --- web/htdocs/config.py | 7 +++++++ web/plugins/views/commands.py | 11 ++--------- web/plugins/visuals/filters.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 1e99404..00a0801 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -372,6 +372,13 @@ def get_role_permissions(): role_permissions[role_id].append(perm['name']) return role_permissions + +def load_stars(): + return set(config.load_user_file("favorites", [])) + +def save_stars(stars): + config.save_user_file("favorites", list(stars)) + # Helper functions def load_user_file(name, deflt, lock = False): path = user_confdir + "/" + name + ".mk" diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 3439e96..a2b1ef2 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -546,13 +546,6 @@ multisite_commands.append({ # | | # '----------------------------------------------------------------------' -def load_stars(): - return set(config.load_user_file("favorites", [])) - -def save_stars(stars): - config.save_user_file("favorites", list(stars)) - - def command_star(cmdtag, spec, row): if html.var("_star") or html.var("_unstar"): star = html.var("_star") and 1 or 0 @@ -565,12 +558,12 @@ def command_star(cmdtag, spec, row): def command_executor_star(command, site): foo, star, spec = command.split(";", 2) - stars = load_stars() + stars = config.load_stars() if star == "0" and spec in stars: stars.remove(spec) elif star == "1": stars.add(spec) - save_stars(stars) + config.save_stars(stars) config.declare_permission("action.star", _("Use favorites"), diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index a80f9ae..2babf82 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -908,7 +908,7 @@ class FilterStarred(FilterTristate): else: aand, oor, eq = "Or", "And", "!=" - stars = load_stars() + stars = config.load_stars() filters = "" count = 0 if self.what == "host":

9 years, 8 months

Check_MK Git: check_mk: Updated bug entries #2192

by Mathias Kettner

Module: check_mk Branch: master Commit: e1e73ad8cbe37607cf8889d9ac7aef92d88238d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1e73ad8cbe376… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 18:39:46 2014 +0200 Updated bug entries #2192 --- .bugs/2192 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2192 b/.bugs/2192 new file mode 100644 index 0000000..260442a --- /dev/null +++ b/.bugs/2192 @@ -0,0 +1,11 @@ +Title: Back button (abort) while adding view to dashboard leads away +Component: multisite +State: open +Date: 2014-10-06 18:38:23 +Targetversion: future +Class: bug + +When you add a view to a dashboard, and in the process press "Back", then +you do not get back but to the list of views. + +Solution: Either remove the button or make it work as expected.

9 years, 8 months

Check_MK Git: check_mk: Updated bug entries #2192, #2193, #2194, #2195

by Mathias Kettner

Module: check_mk Branch: master Commit: a8b7ada67eebe94b135266a96486394db8ede757 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8b7ada67eebe9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 19:10:56 2014 +0200 Updated bug entries #2192, #2193, #2194, #2195 --- .bugs/2192 | 2 +- .bugs/2193 | 2 +- .bugs/2194 | 2 +- .bugs/2195 | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.bugs/2192 b/.bugs/2192 index 260442a..b163378 100644 --- a/.bugs/2192 +++ b/.bugs/2192 @@ -1,4 +1,4 @@ -Title: Back button (abort) while adding view to dashboard leads away +Title: Dashboard: Back button (abort) while adding view to dashboard leads away Component: multisite State: open Date: 2014-10-06 18:38:23 diff --git a/.bugs/2193 b/.bugs/2193 index 943d5a0..70f27d8 100644 --- a/.bugs/2193 +++ b/.bugs/2193 @@ -1,4 +1,4 @@ -Title: Dashboard editor: after going to a dashlet detail, edit mode is lost +Title: Dashboard: after going to a dashlet detail, edit mode is lost Component: multisite State: open Date: 2014-10-06 19:00:53 diff --git a/.bugs/2194 b/.bugs/2194 index 9e5b135..2d25fff 100644 --- a/.bugs/2194 +++ b/.bugs/2194 @@ -1,4 +1,4 @@ -Title: Exception when editing dashlet details of host stats +Title: Dashboard: Exception when editing dashlet details of host stats Component: multisite State: open Date: 2014-10-06 19:02:25 diff --git a/.bugs/2195 b/.bugs/2195 new file mode 100644 index 0000000..7c58a02 --- /dev/null +++ b/.bugs/2195 @@ -0,0 +1,9 @@ +Title: Group all context boxes together into one box in visual editor +Component: multisite +State: open +Date: 2014-10-06 19:10:03 +Targetversion: 1.2.5i1 +Class: nastiness + +Currently due to the large number of mostly useless boxes everything +get's very confuscated...

9 years, 8 months

Check_MK Git: check_mk: Updated bug entries #2193, #2194

by Mathias Kettner

Module: check_mk Branch: master Commit: d815f56d26540075440741d8f12320b3ad94e776 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d815f56d265400… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 19:03:02 2014 +0200 Updated bug entries #2193, #2194 --- .bugs/2193 | 10 ++++++++++ .bugs/2194 | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/.bugs/2193 b/.bugs/2193 new file mode 100644 index 0000000..943d5a0 --- /dev/null +++ b/.bugs/2193 @@ -0,0 +1,10 @@ +Title: Dashboard editor: after going to a dashlet detail, edit mode is lost +Component: multisite +State: open +Date: 2014-10-06 19:00:53 +Targetversion: future +Class: nastiness + +When you are in dashboard edit mode and go to the details of a dashlet +and then got back - either by saving or by the back button - then the +edit mode of the dashboard is lost. But it should keep in edit mode. diff --git a/.bugs/2194 b/.bugs/2194 new file mode 100644 index 0000000..9e5b135 --- /dev/null +++ b/.bugs/2194 @@ -0,0 +1,17 @@ +Title: Exception when editing dashlet details of host stats +Component: multisite +State: open +Date: 2014-10-06 19:02:25 +Targetversion: future +Class: bug + +When you go to the dashlet properties of the host statistics, then you get +an exception: + +Internal error: 'single_infos' +Traceback (most recent call last): + File "/omd/sites/heute/share/check_mk/web/htdocs/index.py", line 241, in handler + handler() + File "/omd/sites/heute/share/check_mk/web/htdocs/dashboard.py", line 816, in page_edit_dashlet + single_infos = dashlet['single_infos'] +KeyError: 'single_infos'

9 years, 8 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c035851724cc0d2a93cc7fefac7704502ba0e63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c035851724cc0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 18:38:13 2014 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 985179c..06f43a4 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2192 +2202

9 years, 8 months

Check_MK Git: check_mk: Allow sub pages on page for editing visuals

by Mathias Kettner

Module: check_mk Branch: master Commit: 54770237d7a3a881b3b5ac00785248a64771237a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54770237d7a3a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 3 00:03:01 2014 +0200 Allow sub pages on page for editing visuals --- web/htdocs/visuals.py | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 23e777e..7f987f7 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -480,12 +480,14 @@ def render_context_specs(visual, context_specs): def page_edit_visual(what, all_visuals, custom_field_handler = None, create_handler = None, try_handler = None, - load_handler = None, info_handler = None): + load_handler = None, info_handler = None, + sub_pages = []): visual_type = visual_types[what] - what_s = what[:-1] + visual_type = visual_types[what] if not config.may("general.edit_" + what): raise MKAuthException(_("You are not allowed to edit %s.") % visual_type["plural_title"]) + what_s = what[:-1] visual = {} @@ -547,6 +549,14 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, html.begin_context_buttons() back_url = html.var("back", "") html.context_button(_("Back"), back_url or "edit_%s.py" % what, "back") + + # Extra buttons to sub modules. These are used for things to edit about + # this visual that are more complex to be done in one value spec. + if mode not in [ "clone", "create" ]: + for title, pagename, icon in sub_pages: + uri = html.makeuri_contextless([(visual_types[what]['ident_attr'], visualname)], + filename = pagename + '.py') + html.context_button(title, uri, icon) html.end_context_buttons() # A few checkboxes concerning the visibility of the visual. These will @@ -608,7 +618,13 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, context_specs = get_context_specs(visual, info_handler) # handle case of save or try or press on search button - if html.var("save") or html.var("try") or html.var("search"): + save_and_go = None + for nr, (title, pagename, icon) in enumerate(sub_pages): + if html.var("save%d" % nr): + save_and_go = html.makeuri_contextless([(visual_types[what]['ident_attr'], visualname)], + filename = pagename + '.py') + + if save_and_go or html.var("save") or html.var("try") or html.var("search"): try: general_properties = vs_general.from_html_vars('general') vs_general.validate_value(general_properties, 'general') @@ -636,10 +652,13 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, visual['context'] = process_context_specs(context_specs) - if html.var("save"): - back = html.var('back') - if not back: - back = 'edit_%s.py' % what + if html.var("save") or save_and_go: + if save_and_go: + back = save_and_go + else: + back = html.var('back') + if not back: + back = 'edit_%s.py' % what if html.check_transaction(): all_visuals[(config.user_id, visual["name"])] = visual @@ -650,7 +669,8 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, del all_visuals[(config.user_id, oldname)] # -> change visual_name in back parameter if back: - back = back.replace('view_name=' + oldname, 'view_name=' + visual["name"]) + varstring = visual_type["ident_attr"] + "=" + back = back.replace(varstring + oldname, varstring + visual["name"]) save(what, all_visuals) html.immediate_browser_redirect(1, back) @@ -690,6 +710,8 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, "language. You can configure the localizations <a href=\"%s\">in the global settings</a>.") % url) html.button("save", _("Save")) + for nr, (title, pagename, icon) in enumerate(sub_pages): + html.button("save%d" % nr, _("Save and go to ") + title) html.hidden_fields() if try_handler:

9 years, 8 months

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014