X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUserColumn.java;h=35610f3510b1266e49e1285f1e8f48831323bd86;hb=9d1dd85af774c08ca520313c0311fbe37ed3dd32;hp=9dae8a4f7e51da22aeb55616ad33e87de649bb4c;hpb=8ff5ddc4f02cb29cc3c1d5d06958bc495b9f9531;p=gpl%2Fargeo-suite.git diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UserColumn.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UserColumn.java index 9dae8a4..35610f3 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UserColumn.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UserColumn.java @@ -4,18 +4,17 @@ import org.argeo.api.acr.Content; import org.argeo.api.acr.ldap.LdapAcrUtils; import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.acr.ldap.LdapObj; +import org.argeo.api.cms.directory.CmsUser; import org.argeo.api.cms.ux.CmsIcon; -import org.argeo.app.ui.SuiteIcon; +import org.argeo.app.ux.SuiteIcon; import org.argeo.cms.CurrentUser; -import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.ux.widgets.Column; -import org.osgi.service.useradmin.User; public class UserColumn implements Column { @Override public String getText(Content role) { if (role.hasContentClass(LdapObj.inetOrgPerson)) - return UserAdminUtils.getUserDisplayName(role.adapt(User.class)); + return role.adapt(CmsUser.class).getDisplayName(); else if (role.hasContentClass(LdapObj.organization)) return role.attr(LdapAttr.o); else if (role.hasContentClass(LdapObj.groupOfNames)) {