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=0d33677ac572da6e018da14fc9556f10af99071e;hb=5330a39edafd14df2e6cdc57aae4e9393ebca75c;hp=32bbc9ffb772008f23f0999bc2f5276037b33a98;hpb=23b7a170cae60b500e9d45551f26b5075eba73a4;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..0d33677ac 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
@@ -20,8 +20,9 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.auth.CurrentUser;
 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;
@@ -31,12 +32,12 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.RoleIconLP;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserDragListener;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
-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;
-import org.argeo.node.ArgeoNames;
-import org.argeo.osgi.useradmin.LdifName;
+import org.argeo.naming.LdapAttrs;
+import org.argeo.naming.LdapObjs;
+import org.argeo.node.NodeConstants;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
@@ -74,7 +75,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 = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
 
 		// Define the displayed columns
 		columnDefs.add(new ColumnDefinition(new RoleIconLP(), "", 26));
@@ -143,10 +144,10 @@ public class GroupsView extends ViewPart implements ArgeoNames {
 	private class MyUserTableViewer extends LdifUsersTable {
 		private static final long serialVersionUID = 8467999509931900367L;
 
-		private boolean showSystemRoles = false;
+		private boolean showSystemRoles;
 
-		private final String[] knownProps = { LdifName.uid.name(),
-				LdifName.cn.name(), LdifName.dn.name() };
+		private final String[] knownProps = { LdapAttrs.uid.name(),
+				LdapAttrs.cn.name(), LdapAttrs.DN };
 
 		public MyUserTableViewer(Composite parent, int style) {
 			super(parent, style);
@@ -157,6 +158,9 @@ public class GroupsView extends ViewPart implements ArgeoNames {
 			final Button showSystemRoleBtn = new Button(staticFilterCmp,
 					SWT.CHECK);
 			showSystemRoleBtn.setText("Show system roles");
+			showSystemRoles = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
+			showSystemRoleBtn.setSelection(showSystemRoles);
+			
 			showSystemRoleBtn.addSelectionListener(new SelectionAdapter() {
 				private static final long serialVersionUID = -7033424592697691676L;
 
@@ -184,13 +188,12 @@ public class GroupsView extends ViewPart implements ArgeoNames {
 						tmpBuilder.append("*)");
 					}
 				if (tmpBuilder.length() > 1) {
-					builder.append("(&(").append(LdifName.objectClass.name())
-							.append("=").append(LdifName.groupOfNames.name())
+					builder.append("(&(").append(LdapAttrs.objectClass.name())
+							.append("=").append(LdapObjs.groupOfNames.name())
 							.append(")");
 					if (!showSystemRoles)
-						builder.append("(!(").append(LdifName.dn.name())
-								.append("=*")
-								.append(AuthConstants.ROLES_BASEDN)
+						builder.append("(!(").append(LdapAttrs.DN).append("=*")
+								.append(NodeConstants.ROLES_BASEDN)
 								.append("))");
 					builder.append("(|");
 					builder.append(tmpBuilder.toString());
@@ -198,17 +201,18 @@ public class GroupsView extends ViewPart implements ArgeoNames {
 				} else {
 					if (!showSystemRoles)
 						builder.append("(&(")
-								.append(LdifName.objectClass.name())
+								.append(LdapAttrs.objectClass.name())
 								.append("=")
-								.append(LdifName.groupOfNames.name())
-								.append(")(!(").append(LdifName.dn.name())
+								.append(LdapObjs.groupOfNames.name())
+								.append(")(!(").append(LdapAttrs.DN)
 								.append("=*")
-								.append(AuthConstants.ROLES_BASEDN)
+								.append(NodeConstants.ROLES_BASEDN)
 								.append(")))");
 					else
-						builder.append("(").append(LdifName.objectClass.name())
+						builder.append("(")
+								.append(LdapAttrs.objectClass.name())
 								.append("=")
-								.append(LdifName.groupOfNames.name())
+								.append(LdapObjs.groupOfNames.name())
 								.append(")");
 
 				}
@@ -249,4 +253,4 @@ public class GroupsView extends ViewPart implements ArgeoNames {
 	public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
 		this.userAdminWrapper = userAdminWrapper;
 	}
-}
\ No newline at end of file
+}