Work on user UI

[lgpl/argeo-commons.git] / org.argeo.security.ui.admin / src / org / argeo / security / ui / admin / internal / parts / GroupsView.java

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
index fd1931a4faf3510057732e357776a780c17d5378..450a4a9598103fd63c4c1a928ce53a8dbffe78b0 100644 (file)
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
@@ -155,7 +155,9 @@ public class GroupsView extends ViewPart implements ArgeoNames {
                                                tmpBuilder.append("*)");
                                        }
                                if (tmpBuilder.length() > 1) {
-                                       builder.append("(&(objectclass=groupOfNames)");
+                                       builder.append("(&(").append(LdifName.objectClass.name())
+                                                       .append("=").append(LdifName.groupOfNames.name())
+                                                       .append(")");
                                        if (!showSystemRoleBtn.getSelection())
                                                builder.append("(!(").append(LdifName.dn.name())
                                                                .append("=*")
@@ -166,12 +168,19 @@ public class GroupsView extends ViewPart implements ArgeoNames {
                                        builder.append("))");
                                } else {
                                        if (!showSystemRoleBtn.getSelection())
-                                               builder.append("(&(objectclass=groupOfNames)(!(")
-                                                               .append(LdifName.dn.name()).append("=*")
+                                               builder.append("(&(")
+                                                               .append(LdifName.objectClass.name())
+                                                               .append("=")
+                                                               .append(LdifName.groupOfNames.name())
+                                                               .append(")(!(").append(LdifName.dn.name())
+                                                               .append("=*")
                                                                .append(UserAdminConstants.SYSTEM_ROLE_BASE_DN)
                                                                .append(")))");
                                        else
-                                               builder.append("(objectclass=groupOfNames)");
+                                               builder.append("(").append(LdifName.objectClass.name())
+                                                               .append("=")
+                                                               .append(LdifName.groupOfNames.name())
+                                                               .append(")");
 
                                }
                                roles = userAdminWrapper.getUserAdmin().getRoles(