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%2FUserBatchUpdateWizard.java;h=ff113d1dd0a41f583df8bcedf2435250d60db840;hb=54cba9d97464302cbcfad9d8a57cb23a17bdddb7;hp=984008bf763ea8b8b020fda38654167fc34fd1b0;hpb=23b7a170cae60b500e9d45551f26b5075eba73a4;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java
index 984008bf7..ff113d1dd 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java
@@ -11,7 +11,6 @@ import javax.transaction.UserTransaction;
 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.internal.useradmin.UserAdminWrapper;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.CommonNameLP;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.DomainNameLP;
@@ -22,6 +21,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.dialogs.IPageChangeProvider;
 import org.eclipse.jface.dialogs.IPageChangedListener;
@@ -358,7 +358,7 @@ public class UserBatchUpdateWizard extends Wizard {
 		@SuppressWarnings("unused")
 		protected boolean getBoleanValue() {
 			// FIXME this is not consistent and will lead to errors.
-			if (ArgeoNames.ARGEO_ENABLED.equals(getCommand()))
+			if ("argeo:enabled".equals(getCommand()))
 				return trueChk.getSelection();
 			else
 				return !trueChk.getSelection();
@@ -415,7 +415,7 @@ public class UserBatchUpdateWizard extends Wizard {
 					200));
 
 			// Only show technical DN to admin
-			if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
+			if (UserAdminUtils.isUserInRole(NodeConstants.ROLE_ADMIN))
 				columnDefs.add(new ColumnDefinition(new UserNameLP(),
 						"Distinguished Name", 300));
 
@@ -529,7 +529,7 @@ public class UserBatchUpdateWizard extends Wizard {
 			columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain",
 					200));
 			// Only show technical DN to admin
-			if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
+			if (UserAdminUtils.isUserInRole(NodeConstants.ROLE_ADMIN))
 				columnDefs.add(new ColumnDefinition(new UserNameLP(),
 						"Distinguished Name", 300));
 			userTableCmp = new ChosenUsersTableViewer(pageCmp, SWT.MULTI