[checkmk-commits] Check_MK Git: check_mk: FIX: Fixed exception in editing code of ldap group to rule plugin

Module: check_mk Branch: master Commit: ac8bb3352399081be83fce2f8b481da265dce5b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac8bb335239908… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Feb 7 09:32:38 2013 +0100 FIX: Fixed exception in editing code of ldap group to rule plugin --- .bugs/914 | 7 +++++-- ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/914 b/.bugs/914 index 831b38c..e872ebf 100644 --- a/.bugs/914 +++ b/.bugs/914 @@ -1,9 +1,12 @@ Title: Host views miss filter "Last host state change" Component: multisite -State: open +Class: feature +State: done Date: 2013-02-05 08:57:08 Targetversion: 1.2.3 -Class: feature The service views have such a filter for the service state. It would be nice to have it also in host views. + +2013-02-07 08:49:46: changed state open -> done +Just implemented this. diff --git a/ChangeLog b/ChangeLog index c1d76f5..47a2a5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * Added oracle_tablespaces configuration to the application checkgroup * FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups * FIX: "Sync & Restart" did not perform restart in distributed WATO setups + * FIX: Fixed exception in editing code of ldap group to rule plugin Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 716d111..810e3b6 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -531,7 +531,7 @@ def ldap_list_roles_with_group_dn(): "be defined within the scope of the " "<a href=\"wato.py?mode=edit_configvar&varname=ldap_groupspec\">LDAP Group Settings</a>."), size = 80, - enforce_suffix = ldap_replace_macros(config.ldap_groupspec['dn']), + enforce_suffix = ldap_replace_macros(config.ldap_groupspec.get('dn', '')), ))) return elements