Adapt commands to the new security model.

[lgpl/argeo-commons.git] / org.argeo.security.ui.admin / src / org / argeo / security / ui / admin / editors / UserEditor.java

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
index f2f233fe4f3a3f9a5613bb6d0c0e15dd595d8f78..761f48b80f0d4292f3858f85fe1cffaad6245090 100644 (file)
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
@@ -15,6 +15,9 @@
  */
 package org.argeo.security.ui.admin.editors;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.argeo.ArgeoException;
 import org.argeo.security.ui.admin.SecurityAdminImages;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
@@ -24,6 +27,7 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.forms.editor.FormEditor;
+import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
@@ -61,6 +65,19 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
                                : SecurityAdminImages.ICON_USER);
        }
 
+       protected List<User> getFlatGroups() {
+               Authorization currAuth = userAdmin.getAuthorization(user);
+               String[] roles = currAuth.getRoles();
+
+               List<User> groups = new ArrayList<User>();
+               for (String roleStr : roles) {
+                       User currRole = (User) userAdmin.getRole(roleStr);
+                       if (!groups.contains(currRole))
+                               groups.add(currRole);
+               }
+               return groups;
+       }
+
        /** Exposes the user (or group) that is displayed by the current editor */
        protected User getDisplayedUser() {
                return user;
@@ -72,12 +89,10 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 
        protected void addPages() {
                try {
-
                        if (user.getType() == Role.GROUP)
                                addPage(new GroupMainPage(this, userAdmin));
                        else
                                addPage(new UserMainPage(this, userAdmin));
-
                } catch (Exception e) {
                        throw new ArgeoException("Cannot add pages", e);
                }