X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FUserAdminUtils.java;h=5a365721136bc07a742d4a3128a996854650f323;hb=0ce8ecfe974cec9f524c16884209cd08544d890d;hp=eed38cc3285aa17de5ca6563f556c0f0e21027c3;hpb=df60fd8de17590b8f4ab32fd0278e57aaaedbfa2;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..5a3657211 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,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; }