X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Feclipse%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Feditors%2FDefaultUserMainPage.java;h=2887edaa6182e8afc0392b9b550d7f53dced124d;hb=2663dfc4d32c474f8fc7407d24bdcf0fa50ce08a;hp=3da89f37c72f515570d13ab615e4b9f5c4d91d4a;hpb=97f324b3c3287950acbac6bff52a67587ca9ce3b;p=lgpl%2Fargeo-commons.git

diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java
index 3da89f37c..2887edaa6 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java
@@ -4,6 +4,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.security.ArgeoSecurityService;
 import org.argeo.security.ArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
 import org.argeo.security.nature.SimpleUserNature;
 import org.argeo.security.ui.SecurityUiPlugin;
 import org.eclipse.jface.viewers.CellEditor;
@@ -55,7 +56,7 @@ public class DefaultUserMainPage extends FormPage {
 		super(editor, ID, "Main");
 		this.securityService = securityService;
 		this.user = user;
-		this.simpleNature = SecurityUiPlugin.findSimpleUserNature(user,
+		this.simpleNature = SimpleUserNature.findSimpleUserNature(user,
 				simpleNatureType);
 	}
 
@@ -89,8 +90,14 @@ public class DefaultUserMainPage extends FormPage {
 		body.setLayout(layout);
 
 		// add widgets (view)
-		tk.createLabel(body, "Username");
-		tk.createLabel(body, user.getUsername());
+		final Text username;
+		if (user.getUsername() != null) {
+			tk.createLabel(body, "Username");
+			tk.createLabel(body, user.getUsername());
+			username = null;
+		} else {
+			username = createLT(body, "Username", "");
+		}
 		final Text firstName = createLT(body, "First name",
 				simpleNature.getFirstName());
 		final Text lastName = createLT(body, "Last name",
@@ -102,6 +109,11 @@ public class DefaultUserMainPage extends FormPage {
 		// create form part (controller)
 		AbstractFormPart part = new SectionPart(section) {
 			public void commit(boolean onSave) {
+				if (username != null) {
+					((SimpleArgeoUser) user).setUsername(username.getText());
+					username.setEditable(false);
+					username.setEnabled(false);
+				}
 				simpleNature.setFirstName(firstName.getText());
 				simpleNature.setLastName(lastName.getText());
 				simpleNature.setEmail(email.getText());