X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fcommands%2FNewUser.java;h=c336753dc6ec19a1f231d2b840ec3ab2b23bd44b;hb=98f57ce4987d7a7bfcea4806b20520f1a01830fa;hp=9d4151caf15826c100b126644ee5df961b138a11;hpb=935a76bdd458e4fb8502783946cb910324388da8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
index 9d4151caf..c336753dc 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
@@ -67,6 +67,7 @@ public class NewUser extends AbstractHandler {
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		NewUserWizard newUserWizard = new NewUserWizard();
+		newUserWizard.setWindowTitle("User creation");
 		WizardDialog dialog = new WizardDialog(
 				HandlerUtil.getActiveShell(event), newUserWizard);
 		dialog.open();
@@ -84,13 +85,15 @@ public class NewUser extends AbstractHandler {
 		private Combo baseDnCmb;
 
 		public NewUserWizard() {
+
 		}
 
 		@Override
 		public void addPages() {
 			mainUserInfo = new MainUserInfoWizardPage();
 			addPage(mainUserInfo);
-			String message = "Dummy wizard to ease user creation tests:\n Mail and last name are automatically "
+			String message = "Default wizard that also eases user creation tests:\n "
+					+ "Mail and last name are automatically "
 					+ "generated form the uid. Password are defauted to 'demo'.";
 			mainUserInfo.setMessage(message, WizardPage.WARNING);
 		}
@@ -110,7 +113,7 @@ public class NewUser extends AbstractHandler {
 
 				String lastNameStr = lastNameTxt.getText();
 				if (UiAdminUtils.notNull(lastNameStr))
-					props.put(LdifName.dn.name(), lastNameStr);
+					props.put(LdifName.sn.name(), lastNameStr);
 
 				String firstNameStr = firstNameTxt.getText();
 				if (UiAdminUtils.notNull(firstNameStr))
@@ -154,8 +157,9 @@ public class NewUser extends AbstractHandler {
 						"Distinguished name", this);
 				dNameTxt.setEnabled(false);
 
-				baseDnCmb = createGridLC(composite, "Base DN", this);
+				baseDnCmb = createGridLC(composite, "Base DN");
 				initialiseDnCmb(baseDnCmb);
+				baseDnCmb.addModifyListener(this);
 				baseDnCmb.addModifyListener(new ModifyListener() {
 					private static final long serialVersionUID = -1435351236582736843L;
 
@@ -247,7 +251,10 @@ public class NewUser extends AbstractHandler {
 			public void setVisible(boolean visible) {
 				super.setVisible(visible);
 				if (visible)
-					usernameTxt.setFocus();
+					if (baseDnCmb.getSelectionIndex() == -1)
+						baseDnCmb.setFocus();
+					else
+						usernameTxt.setFocus();
 			}
 
 			public String getUsername() {
@@ -270,7 +277,8 @@ public class NewUser extends AbstractHandler {
 				throw new ArgeoException(
 						"No writable base dn found. Cannot create user");
 			combo.setItems(dns.toArray(new String[0]));
-			// combo.select(0);
+			if (dns.size() == 1)
+				combo.select(0);
 		}
 
 		private String getMail(String username) {
@@ -287,18 +295,14 @@ public class NewUser extends AbstractHandler {
 						+ username + " with base dn " + baseDn, e);
 			}
 		}
-
 	}
 
-	private Combo createGridLC(Composite parent, String label,
-			ModifyListener modifyListener) {
+	private Combo createGridLC(Composite parent, String label) {
 		Label lbl = new Label(parent, SWT.LEAD);
 		lbl.setText(label);
 		lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 		Combo combo = new Combo(parent, SWT.LEAD | SWT.BORDER | SWT.READ_ONLY);
 		combo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		if (modifyListener != null)
-			combo.addModifyListener(modifyListener);
 		return combo;
 	}