Module: check_mk Branch: master Commit: 4e568acd20117723388dd544a1618e52a461581e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e568acd201177… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 16 10:43:25 2015 +0200 #2466 FIX Fixed exception when searching for rulesets / global settings using special characters like umlauts --- .werks/2466 | 10 ++++++++++ ChangeLog | 2 +- web/htdocs/wato.py | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/2466 b/.werks/2466 new file mode 100644 index 0000000..894c6a9 --- /dev/null +++ b/.werks/2466 @@ -0,0 +1,10 @@ +Title: Fixed exception when searching for rulesets / global settings using special characters like umlauts +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437036167 + + diff --git a/ChangeLog b/ChangeLog index 4363a09..6c62134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,7 +17,6 @@ * 2129 db_ checks: new mk_db2.linux agent supporting the existing db2_ checks * 1269 esx_vsphere_counters.diskio: Check now uses the default diskstat implementation... NOTE: Please refer to the migration notes! - * 2401 windows agent: changed executionpolicy for powershell scripts to unrestricted... * 1272 alcatel_power, alcatel_temp Support for stacked environments... NOTE: Please refer to the migration notes! * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... @@ -90,6 +89,7 @@ * 2397 FIX: Fixed wrong confirm text in distributed setup when activating foreign changes * 2461 FIX: Service Discovery: Hiding action buttons to rules when user is not permitted to rulesets * 2464 FIX: UDP ports for SNMP communication can now be configured via WATO + * 2466 FIX: Fixed exception when searching for rulesets / global settings using special characters like umlauts Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7a96de5..5217c60 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7862,7 +7862,7 @@ def mode_edit_ldap_connection(phase): # '----------------------------------------------------------------------' def mode_globalvars(phase): - search = html.var("search") + search = html.var_utf8("search") if search != None: search = search.strip().lower() @@ -7948,8 +7948,8 @@ def render_global_configuration_variables(default_values, current_settings, show else: continue - help_text = type(valuespec.help()) == unicode and valuespec.help().encode("utf-8") or valuespec.help() or '' - title_text = type(valuespec.title()) == unicode and valuespec.title().encode("utf-8") or valuespec.title() + help_text = valuespec.help() or '' + title_text = valuespec.title() if search and search not in groupname \ and search not in domain \ @@ -14463,7 +14463,7 @@ def mode_rulesets(phase, group=None): if not group: group = html.var("group") # obligatory - search = html.var("search") + search = html.var_utf8("search") if search != None: search = search.strip().lower()