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=3d72ce74a98d5905a28c321ce698591e09f2a063;hpb=236d4f8f0f62dcb6ac4598698c3d9f4ae5dd5118;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 3d72ce74a..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,11 +5,10 @@ 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;
@@ -17,17 +16,9 @@ import org.eclipse.swt.widgets.Control;
 /** 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)
 			throws RepositoryException {
@@ -37,11 +28,17 @@ public class UserPage implements CmsUiProvider {
 				cmsEditable);
 
 		Control control = userViewer.getControl();
+
+		// 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());
@@ -67,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