import org.apache.commons.logging.LogFactory;
import org.argeo.ArgeoException;
import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.util.useradmin.UserAdminUtils;
import org.argeo.eclipse.ui.ColumnDefinition;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.eclipse.ui.parts.LdifUsersTable;
200));
// Only show technical DN to admin
- if (UiAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
+ if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
columnDefs.add(new ColumnDefinition(new UserNameLP(),
"Distinguished Name", 300));
private static final long serialVersionUID = 5080437561015853124L;
private final String[] knownProps = { LdifName.uid.name(),
LdifName.dn.name(), LdifName.cn.name(),
- LdifName.givenname.name(), LdifName.sn.name(),
+ LdifName.givenName.name(), LdifName.sn.name(),
LdifName.mail.name() };
public ChooseUserTableViewer(Composite parent, int style) {
StringBuilder builder = new StringBuilder();
StringBuilder tmpBuilder = new StringBuilder();
- if (UiAdminUtils.notNull(filter))
+ if (EclipseUiUtils.notEmpty(filter))
for (String prop : knownProps) {
tmpBuilder.append("(");
tmpBuilder.append(prop);
for (Role role : roles)
// Prevent current logged in user to perform batch on
// himself
- if (!UiAdminUtils.isCurrentUser((User) role))
+ if (!UserAdminUtils.isCurrentUser((User) role))
users.add((User) role);
return users;
}
columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain",
200));
// Only show technical DN to admin
- if (UiAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
+ if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
columnDefs.add(new ColumnDefinition(new UserNameLP(),
"Distinguished Name", 300));
userTableCmp = new ChosenUsersTableViewer(pageCmp, SWT.MULTI