[checkmk-commits] Check_MK Git: check_mk: ldap: Sorting attribute plugins; removed old option

git version control git at mathias-kettner.de
Wed Nov 21 14:35:07 CET 2012


Module: check_mk
Branch: master
Commit: 9b120c7e5a950d07d25cb310362966052413d0c4
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b120c7e5a950d07d25cb310362966052413d0c4

Author: Lars Michelsen <lm at mathias-kettner.de>
Date:   Tue Nov 20 16:08:31 2012 +0100

ldap: Sorting attribute plugins; removed old option

---

 web/htdocs/config.py       |    1 -
 web/plugins/userdb/ldap.py |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/htdocs/config.py b/web/htdocs/config.py
index a9fc912..2d9e568 100644
--- a/web/htdocs/config.py
+++ b/web/htdocs/config.py
@@ -596,7 +596,6 @@ def load_default_values(into):
 
     into["user_connectors"]      = ['htpasswd']
     into["ldap_connection"]      = {}
-    into["ldap_attr_map"]        = {}
     into["ldap_userspec"]        = {}
     into["ldap_groupspec"]       = {}
     into["ldap_active_plugins"]  = {'email', 'alias', 'auth_expire'}
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index 9a31d96..5f40e38 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -290,7 +290,8 @@ def ldap_list_attribute_plugins():
 # Returns a list of pairs (key, parameters) of all available attribute plugins
 def ldap_attribute_plugins_elements():
     elements = []
-    for key, plugin in ldap_attribute_plugins.items():
+    items = sorted(ldap_attribute_plugins.items(), key = lambda x: x[1]['title'])
+    for key, plugin in items:
         if 'parameters' not in plugin:
             param = []
         else:



More information about the checkmk-commits mailing list