Introduce UserMenuLink

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

diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java
index f4acb8a9d410b23566e3a5e642711c3b3f9c61af..610c49c7f7f9e2994b1dc97be64135a2728c6ebc 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java
@@ -4,16 +4,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.jcr.Item;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.ArgeoException;
+import org.argeo.cms.internal.auth.JcrSecurityModel;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.viewers.EditablePart;
 import org.argeo.cms.viewers.NodePart;
 import org.argeo.cms.widgets.StyledControl;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.security.UserAdminService;
-import org.argeo.security.jcr.JcrSecurityModel;
 import org.argeo.security.jcr.JcrUserDetails;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -78,7 +79,7 @@ public class UserRolesPart extends StyledControl implements EditablePart,
        }
 
        @Override
-       protected Control createControl(Composite box, String style) {
+       public Control createControl(Composite box, String style) {
                // box.setLayout(CmsUtils.noSpaceGridLayout());
                box.setLayout(new GridLayout());
 
@@ -174,7 +175,8 @@ public class UserRolesPart extends StyledControl implements EditablePart,
        public void setUserAdminService(UserAdminService userAdminService) {
                this.userAdminService = userAdminService;
                try {
-                       String username = getNode().getProperty(ArgeoNames.ARGEO_USER_ID)
+                       Node currNode = getNode();
+                       String username = currNode.getProperty(ArgeoNames.ARGEO_USER_ID)
                                        .getString();
                        if (userAdminService.userExists(username)) {
                                JcrUserDetails userDetails = (JcrUserDetails) userAdminService