enhance user management strategies

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / users / UserPage.java

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 3d72ce74a98d5905a28c321ce698591e09f2a063..ef0e9313e93b6961c6c24f13408e8aec5c393070 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/users/UserPage.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UserPage.java
@@ -9,7 +9,6 @@ import org.argeo.cms.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;
@@ -20,6 +19,8 @@ public class UserPage implements CmsUiProvider {
        // Enable user CRUD // INJECTED
        private UserAdminService userAdminService;
 
+       // private UserDetailsManager userDetailsManager;
+
        // private JcrSecurityModel jcrSecurityModel;
 
        // public UserPage(UserAdminService userAdminService,
@@ -37,11 +38,17 @@ public class UserPage implements CmsUiProvider {
                                cmsEditable);
 
                Control control = userViewer.getControl();
+
+               // 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());
@@ -68,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