[checkmk-commits] 4041 FIX Fix exception when editing global configuration settings

Module: check_mk Branch: master Commit: f07ed44c15e2c2b16549b9db9c58e74eb137cdc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f07ed44c15e2c2… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Nov 4 11:53:36 2016 +0100 4041 FIX Fix exception when editing global configuration settings The exception just happened when you clicked on the name of the configuration variable. If you clicked on the value everything is fine. --- .werks/4041 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4041 b/.werks/4041 new file mode 100644 index 0000000..ead0605 --- /dev/null +++ b/.werks/4041 @@ -0,0 +1,11 @@ +Title: Fix exception when editing global configuration settings +Level: 2 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1478256770 +Class: fix + +The exception just happened when you clicked on the name of the +configuration variable. If you clicked on the value everything is +fine. diff --git a/ChangeLog b/ChangeLog index c203be1..2d765e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 3821 FIX: WATO Network Scan: Fixed risk of loosing site tags when performing a network scan... * 3951 FIX: oracle_sessions: fixed bug with default absolute levels... * 4039 FIX: Fix UnicodeEncodeError exception in WATO folder display... + * 4041 FIX: Fix exception when editing global configuration settings... Notifications: * 3957 mail: now allows extra HTML section between body and table diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 95375d4..3501720 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6475,9 +6475,9 @@ def render_global_configuration_variables(group_names, default_values, current_s edit_url = folder_preserving_link([("mode", edit_mode), ("varname", varname), ("site", html.var("site", ""))]) - title = '<a href="%s" class=%s title="%s">%s</a>' % \ + title = HTML('<a href="%s" class=%s title="%s">%s</a>' % \ (edit_url, varname in current_settings and '"modified"' or '""', - html.strip_tags(help_text), title_text) + html.strip_tags(help_text), title_text)) if varname in current_settings: to_text = valuespec.value_to_text(current_settings[varname])