[checkmk-commits] Check_MK Git: check_mk: ldap/userdb: fixed some styling issues

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


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

Author: Lars Michelsen <lm at mathias-kettner.de>
Date:   Wed Nov 14 13:41:23 2012 +0100

ldap/userdb: fixed some styling issues

---

 web/htdocs/wato.py             |    4 +++-
 web/plugins/userdb/htpasswd.py |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 5b5ecf4..8146253 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7808,10 +7808,12 @@ def mode_users(phase):
         # Connector
         html.write("<td>%s</td>" % userdb.get_connector(user.get('connector'))['title'])
 
+        locked_attributes = userdb.locked_attributes(user.get('connector'))
+
         # Authentication
         if "automation_secret" in user:
             auth_method = _("Automation")
-        elif user.get("password"):
+        elif user.get("password") or 'password' in locked_attributes:
             auth_method = _("Password")
         else:
             auth_method = "<i>%s</i>" % _("none")
diff --git a/web/plugins/userdb/htpasswd.py b/web/plugins/userdb/htpasswd.py
index 5fc9f56..1044e88 100644
--- a/web/plugins/userdb/htpasswd.py
+++ b/web/plugins/userdb/htpasswd.py
@@ -112,7 +112,7 @@ def htpasswd_save(users):
 
 multisite_user_connectors.append({
     'id':    'htpasswd',
-    'title': _('htpasswd file'),
+    'title': _('htpasswd'),
 
     # Register hook functions
     'login': htpasswd_login,



More information about the checkmk-commits mailing list