X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fusers%2FUserPage.java;h=83998baadd7572482c307d07396797f29bcd1d35;hb=5ba1340812d3f14d2caecf6eab57cc9c753ef20c;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..83998baad 100644
--- a/org.argeo.cms/src/org/argeo/cms/users/UserPage.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UserPage.java
@@ -5,22 +5,23 @@ 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
 	private UserAdminService userAdminService;
-	private JcrSecurityModel jcrSecurityModel;
+
+	// private UserDetailsManager userDetailsManager;
+
+	// private JcrSecurityModel jcrSecurityModel;
 
 	// public UserPage(UserAdminService userAdminService,
 	// JcrSecurityModel jcrSecurityModel) {
@@ -37,15 +38,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.close
+		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;
 	}
@@ -69,7 +75,8 @@ public class UserPage implements CmsUiProvider {
 		this.userAdminService = userAdminService;
 	}
 
-	public void setJcrSecurityModel(JcrSecurityModel jcrSecurityModel) {
-		this.jcrSecurityModel = jcrSecurityModel;
-	}
+	// public void setUserDetailsManager(UserDetailsManager userDetailsManager)
+	// {
+	// this.userDetailsManager = userDetailsManager;
+	// }
 }
\ No newline at end of file