X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fusers%2FUserPage.java;h=0b9844344711a0e6dc607dc885812ed7eea2bb01;hb=f7944a8accf7b9cfc3cffe6e6f5c611cd48f592c;hp=2f4616d337adc566d158c9322b88d779beeec91d;hpb=050d54bb859aaed19777b32d7c9e677c532ef52f;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserPage.java b/org.argeo.cms/src/org/argeo/cms/users/UserPage.java
index 2f4616d33..0b9844344 100644
--- a/org.argeo.cms/src/org/argeo/cms/users/UserPage.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UserPage.java
@@ -5,28 +5,19 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.cms.CmsEditable;
 import org.argeo.cms.CmsUiProvider;
-import org.argeo.cms.CmsUtils;
+import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.viewers.JcrVersionCmsEditable;
 import org.argeo.cms.widgets.ScrolledPage;
 import org.argeo.security.UserAdminService;
-import org.argeo.security.jcr.JcrSecurityModel;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 
 /** Enable management of a given user */
 public class UserPage implements CmsUiProvider {
 
-	// Enable user CRUD // INJECTED
+	/* DEPENDENCY INJECTION */
 	private UserAdminService userAdminService;
-	private JcrSecurityModel jcrSecurityModel;
-
-	// public UserPage(UserAdminService userAdminService,
-	// JcrSecurityModel jcrSecurityModel) {
-	// this.userAdminService = userAdminService;
-	// this.jcrSecurityModel = jcrSecurityModel;
-	// }
 
 	@Override
 	public Control createUi(Composite parent, Node context)
@@ -37,15 +28,20 @@ public class UserPage implements CmsUiProvider {
 				cmsEditable);
 
 		Control control = userViewer.getControl();
-		Composite par = control.getParent();
 
-		new Label(par, SWT.NONE).setText("Work in progress terminate.");
+		// FIXME not satisfying.
+		if (control instanceof UserPart)
+			((UserPart) control).setUserAdminService(userAdminService);
+
+		Composite par = control.getParent();
 
 		UserRolesPart rolesPart = new UserRolesPart(par, SWT.NO_FOCUS, context,
 				true);
 		rolesPart.setUserAdminService(userAdminService);
+		rolesPart.setUserAdminService(userAdminService);
 		rolesPart.createControl(rolesPart, UserStyles.USER_FORM_TEXT);
 		rolesPart.refresh();
+		rolesPart.setLayoutData(CmsUtils.fillWidth());
 
 		return page;
 	}
@@ -68,8 +64,4 @@ public class UserPage implements CmsUiProvider {
 	public void setUserAdminService(UserAdminService userAdminService) {
 		this.userAdminService = userAdminService;
 	}
-
-	public void setJcrSecurityModel(JcrSecurityModel jcrSecurityModel) {
-		this.jcrSecurityModel = jcrSecurityModel;
-	}
 }
\ No newline at end of file