X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fjcr%2Fparts%2FAddPrivilegeWizard.java;h=6837a7d2ab6f9c165c5228a0edfc7b76e37883a1;hb=5b444174cd13680f99944026877f6cac2e1faba1;hp=1b39812a89f84932345497249623b68a6c828d08;hpb=cdc554ae7ace7f07bf7960bb3fd1e60e0a01d12f;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
index 1b39812a8..6837a7d2a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
@@ -23,7 +23,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.security.Privilege;
 
-import org.argeo.cms.ui.workbench.useradmin.PickUpUserDialog;
+import org.argeo.cms.ui.useradmin.PickUpUserDialog;
 import org.argeo.cms.util.UserAdminUtils;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
@@ -57,6 +57,7 @@ public class AddPrivilegeWizard extends Wizard {
 	private Session currentSession;
 	private String targetPath;
 	// Chosen parameters
+	private String chosenDn;
 	private User chosenUser;
 	private String jcrPrivilege;
 
@@ -108,7 +109,12 @@ public class AddPrivilegeWizard extends Wizard {
 		if (!canFinish())
 			return false;
 		try {
-			JcrUtils.addPrivilege(currentSession, targetPath, chosenUser.getName(), jcrPrivilege);
+			String username = chosenUser.getName();
+			if (EclipseUiUtils.notEmpty(chosenDn) && chosenDn.equalsIgnoreCase(username))
+				// Enable forcing the username case. TODO clean once this issue
+				// has been generally addressed
+				username = chosenDn;
+			JcrUtils.addPrivilege(currentSession, targetPath, username, jcrPrivilege);
 		} catch (RepositoryException re) {
 			throw new EclipseUiException(
 					"Cannot set " + jcrPrivilege + " for " + chosenUser.getName() + " on " + targetPath, re);
@@ -135,15 +141,15 @@ public class AddPrivilegeWizard extends Wizard {
 
 			// specify subject
 			createBoldLabel(composite, "User or group name");
-			final Label groupNameLbl = new Label(composite, SWT.LEAD);
-			groupNameLbl.setLayoutData(EclipseUiUtils.fillWidth());
+			final Label userNameLbl = new Label(composite, SWT.LEAD);
+			userNameLbl.setLayoutData(EclipseUiUtils.fillWidth());
 
 			Link pickUpLk = new Link(composite, SWT.LEFT);
 			pickUpLk.setText(" <a>Change</a> ");
 
 			createBoldLabel(composite, "User or group DN");
-			final Text groupNameTxt = new Text(composite, SWT.LEAD | SWT.BORDER);
-			groupNameTxt.setLayoutData(EclipseUiUtils.fillWidth(2));
+			final Text userNameTxt = new Text(composite, SWT.LEAD | SWT.BORDER);
+			userNameTxt.setLayoutData(EclipseUiUtils.fillWidth(2));
 
 			pickUpLk.addSelectionListener(new SelectionAdapter() {
 				private static final long serialVersionUID = 1L;
@@ -153,18 +159,18 @@ public class AddPrivilegeWizard extends Wizard {
 					PickUpUserDialog dialog = new PickUpUserDialog(getShell(), "Choose a group or a user", userAdmin);
 					if (dialog.open() == Window.OK) {
 						chosenUser = dialog.getSelected();
-						groupNameLbl.setText(UserAdminUtils.getCommonName(chosenUser));
-						groupNameTxt.setText(chosenUser.getName());
+						userNameLbl.setText(UserAdminUtils.getCommonName(chosenUser));
+						userNameTxt.setText(chosenUser.getName());
 					}
 				}
 			});
 
-			groupNameTxt.addFocusListener(new FocusListener() {
+			userNameTxt.addFocusListener(new FocusListener() {
 				private static final long serialVersionUID = 1965498600105667738L;
 
 				@Override
 				public void focusLost(FocusEvent event) {
-					String dn = groupNameTxt.getText();
+					String dn = userNameTxt.getText();
 					if (EclipseUiUtils.isEmpty(dn))
 						return;
 
@@ -176,7 +182,7 @@ public class AddPrivilegeWizard extends Wizard {
 								"DN " + dn + " is not valid.\nError message: " + e.getMessage()
 										+ "\n\t\tDo you want to try again?");
 						if (tryAgain)
-							groupNameTxt.setFocus();
+							userNameTxt.setFocus();
 						else
 							resetOnFail();
 					}
@@ -185,18 +191,19 @@ public class AddPrivilegeWizard extends Wizard {
 						boolean tryAgain = MessageDialog.openQuestion(getShell(), "Unexisting role",
 								"User/group " + dn + " does not exist. " + "Do you want to try again?");
 						if (tryAgain)
-							groupNameTxt.setFocus();
+							userNameTxt.setFocus();
 						else
 							resetOnFail();
 					} else {
 						chosenUser = newChosen;
-						groupNameLbl.setText(UserAdminUtils.getCommonName(chosenUser));
+						chosenDn = dn;
+						userNameLbl.setText(UserAdminUtils.getCommonName(chosenUser));
 					}
 				}
 
 				private void resetOnFail() {
 					String oldDn = chosenUser == null ? "" : chosenUser.getName();
-					groupNameTxt.setText(oldDn);
+					userNameTxt.setText(oldDn);
 				}
 
 				@Override