Simplify LDAP directory.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / UserAdminUtils.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
index eed38cc3285aa17de5ca6563f556c0f0e21027c3..5a365721136bc07a742d4a3128a996854650f323 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
@@ -67,16 +67,17 @@ public class UserAdminUtils {
         */
        public static String getUserDisplayName(UserAdmin userAdmin, String dn) {
                Role user = userAdmin.getRole(dn);
-               String dName;
                if (user == null)
-                       dName = getUserLocalId(dn);
-               else {
-                       dName = getProperty(user, LdapAttrs.displayName.name());
-                       if (isEmpty(dName))
-                               dName = getProperty(user, LdapAttrs.cn.name());
-                       if (isEmpty(dName))
-                               dName = getUserLocalId(dn);
-               }
+                       return getUserLocalId(dn);
+               return getUserDisplayName(user);
+       }
+
+       public static String getUserDisplayName(Role user) {
+               String dName = getProperty(user, LdapAttrs.displayName.name());
+               if (isEmpty(dName))
+                       dName = getProperty(user, LdapAttrs.cn.name());
+               if (isEmpty(dName))
+                       dName = getUserLocalId(user.getName());
                return dName;
        }