X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FUserAdminUtils.java;h=e3eb442492055e7cbcc02b641ef8f44b2301355c;hb=e57ee18ac7b8cfd2bdf4b2e56a65275ce24732b3;hp=eed38cc3285aa17de5ca6563f556c0f0e21027c3;hpb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;p=lgpl%2Fargeo-commons.git

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 eed38cc32..e3eb44249 100644
--- 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,19 @@ 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 = getProperty(user, LdapAttrs.uid.name());
+		if (isEmpty(dName))
+			dName = getUserLocalId(user.getName());
 		return dName;
 	}
 
@@ -135,7 +138,7 @@ public class UserAdminUtils {
 	/** Simply retrieves a display name of the relevant domain */
 	public final static String getDomainName(User user) {
 		String dn = user.getName();
-		if (dn.endsWith(CmsConstants.ROLES_BASEDN))
+		if (dn.endsWith(CmsConstants.SYSTEM_ROLES_BASEDN))
 			return "System roles";
 		if (dn.endsWith(CmsConstants.TOKENS_BASEDN))
 			return "Tokens";