[checkmk-commits] Check_MK Git: check_mk: Fixed wording; Fixed exception in complain phase while adding a new view dashlet

Module: check_mk Branch: master Commit: 2447c364ccf4a41251981b568ca385d241f1843c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2447c364ccf4a4… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Oct 7 09:40:50 2014 +0200 Fixed wording; Fixed exception in complain phase while adding a new view dashlet --- web/htdocs/dashboard.py | 4 ++-- web/plugins/dashboard/dashlets.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 5ad17c3..e0925af 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -980,9 +980,9 @@ def page_delete_dashlet(): dashboard['mtime'] = int(time.time()) visuals.save('dashboards', dashboards) - html.message(_('The dashlet has deleted.')) + html.message(_('The dashlet has been deleted.')) except MKUserError, e: - html.write("<div class=error>%s</div>\n" % e.message) + html.write("<div class=error>%s</div>\n" % html.attrencode(e.message)) return html.immediate_browser_redirect(1, back_url) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 554445a..49e9167 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -534,7 +534,8 @@ def dashlet_view_parameters(): def dashlet_view_render_input(dashlet): import views # FIXME: HACK, clean this up somehow views.load_views() - if 'group_painters' in dashlet: # only needed in case of loading + if html.var("id"): + # only needed in case of editing an existing view views.transform_view_to_valuespec(dashlet) return views.render_view_config(dashlet)