X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fproviders%2FUserFilter.java;h=2a230dd6bff99cb8b722dc7eb0617d8a9c0294c5;hb=f2d02f1aa5dc31c75049be1ba2b79a49f3d856af;hp=742b7d3931d2648b8f3d993a92a5eafdfc1ef2a5;hpb=25e98954db6faeec4ba9950f651e81fbea595b0c;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java index 742b7d393..2a230dd6b 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java @@ -4,7 +4,7 @@ import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty; import org.argeo.cms.auth.AuthConstants; import org.argeo.osgi.useradmin.LdifName; -import org.argeo.security.ui.admin.internal.UiAdminUtils; +import org.argeo.security.ui.admin.internal.UserAdminUtils; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.osgi.service.useradmin.User; @@ -35,11 +35,10 @@ public class UserFilter extends ViewerFilter { @Override public boolean select(Viewer viewer, Object parentElement, Object element) { User user = (User) element; - if (!showSystemRole && user.getName().matches( ".*(" + AuthConstants.ROLES_BASEDN + ")")) - // UiAdminUtils.getProperty(user, LdifName.dn.name()) + // UserAdminUtils.getProperty(user, LdifName.dn.name()) // .toLowerCase().endsWith(AuthConstants.ROLES_BASEDN)) return false; @@ -50,7 +49,7 @@ public class UserFilter extends ViewerFilter { return true; for (String key : knownProps) { - String currVal = UiAdminUtils.getProperty(user, key); + String currVal = UserAdminUtils.getProperty(user, key); if (notEmpty(currVal) && currVal.toLowerCase().matches(searchString)) return true;