X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fparts%2FGroupsView.java;h=ec20a04e7d8e60829047a9ee99382ead81a25947;hb=fd8f2c91e47d38445ba9702b40559939162f666d;hp=32bbc9ffb772008f23f0999bc2f5276037b33a98;hpb=5857e869a5760aeb6de2c32d32ed4de3e28b42b6;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java index 32bbc9ffb..ec20a04e7 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java @@ -21,7 +21,6 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; -import org.argeo.cms.auth.AuthConstants; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener; import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper; @@ -36,6 +35,7 @@ import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.node.ArgeoNames; +import org.argeo.node.NodeConstants; import org.argeo.osgi.useradmin.LdifName; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; @@ -74,7 +74,7 @@ public class GroupsView extends ViewPart implements ArgeoNames { public void createPartControl(Composite parent) { parent.setLayout(EclipseUiUtils.noSpaceGridLayout()); - boolean isAdmin = UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN); + boolean isAdmin = UserAdminUtils.isUserInRole(NodeConstants.ROLE_ADMIN); // Define the displayed columns columnDefs.add(new ColumnDefinition(new RoleIconLP(), "", 26)); @@ -190,7 +190,7 @@ public class GroupsView extends ViewPart implements ArgeoNames { if (!showSystemRoles) builder.append("(!(").append(LdifName.dn.name()) .append("=*") - .append(AuthConstants.ROLES_BASEDN) + .append(NodeConstants.ROLES_BASEDN) .append("))"); builder.append("(|"); builder.append(tmpBuilder.toString()); @@ -203,7 +203,7 @@ public class GroupsView extends ViewPart implements ArgeoNames { .append(LdifName.groupOfNames.name()) .append(")(!(").append(LdifName.dn.name()) .append("=*") - .append(AuthConstants.ROLES_BASEDN) + .append(NodeConstants.ROLES_BASEDN) .append(")))"); else builder.append("(").append(LdifName.objectClass.name())