Prepare next development cycle

[gpl/argeo-suite.git] / swt / org.argeo.app.ui / src / org / argeo / app / ui / people / GroupUiProvider.java

diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/GroupUiProvider.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/GroupUiProvider.java
index 8cf24f00c0e7851cd0160be65ef751b96b2e5a4f..6a805c68ac34bbd7b9fbb7b93e30ee9f51ca33f9 100644 (file)
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/GroupUiProvider.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/GroupUiProvider.java
@@ -1,16 +1,22 @@
 package org.argeo.app.ui.people;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentSession;
+import org.argeo.api.acr.ldap.LdapAcrUtils;
 import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.acr.ldap.LdapObj;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.cms.directory.CmsGroup;
+import org.argeo.api.cms.directory.CmsRole;
+import org.argeo.api.cms.directory.CmsUser;
 import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.api.cms.directory.HierarchyUnit;
-import org.argeo.app.ui.SuiteIcon;
-import org.argeo.app.ui.SuiteMsg;
-import org.argeo.app.ui.SuiteUiUtils;
+import org.argeo.app.swt.ux.SuiteSwtUtils;
+import org.argeo.app.ux.SuiteIcon;
+import org.argeo.app.ux.SuiteMsg;
 import org.argeo.cms.CurrentUser;
 import org.argeo.cms.acr.ContentUtils;
 import org.argeo.cms.swt.CmsSwtTheme;
@@ -29,7 +35,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
-import org.osgi.service.useradmin.Role;
 
 public class GroupUiProvider implements SwtUiProvider {
        private CmsUserManager cmsUserManager;
@@ -44,16 +49,17 @@ public class GroupUiProvider implements SwtUiProvider {
                ContentSession contentSession = ((ProvidedContent) context).getSession();
 
                TabularPart<Content, Content> membersPart = new AbstractTabularPart<Content, Content>() {
-                       Role[] roles = context.adapt(CmsGroup.class).getMembers();
+                       List<CmsRole> roles;
 
                        @Override
                        public int getItemCount() {
-                               return roles.length;
+                               roles = new ArrayList<CmsRole>(context.adapt(CmsGroup.class).getDirectMembers());
+                               return roles.size();
                        }
 
                        @Override
                        public Content getData(int row) {
-                               Role role = roles[row];
+                               CmsRole role = roles.get(row);
                                Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, role);
                                return content;
                        }
@@ -68,14 +74,10 @@ public class GroupUiProvider implements SwtUiProvider {
 
                // title
                // TODO localise at content level
-               String title;
-               if (context.hasContentClass(LdapObj.organization))
-                       title = SuiteMsg.org.lead() + " " + context.attr(LdapAttr.cn) + " ("
-                                       + hierarchyUnit.getHierarchyUnitLabel(CurrentUser.locale()) + ")";
-               else
-                       title = SuiteMsg.group.lead() + " " + context.attr(LdapAttr.cn) + " ("
-                                       + hierarchyUnit.getHierarchyUnitLabel(CurrentUser.locale()) + ")";
-               SuiteUiUtils.addFormLabel(area, title);
+               String title = (context.hasContentClass(LdapObj.organization) ? SuiteMsg.org.lead() : SuiteMsg.group.lead())
+                               + " " + LdapAcrUtils.getLocalized(context, LdapAttr.cn.qName(), CurrentUser.locale()) + " ("
+                               + hierarchyUnit.getHierarchyUnitLabel(CurrentUser.locale()) + ")";
+               SuiteSwtUtils.addFormLabel(area, title);
 
                // toolbar
                ToolBar toolBar = new ToolBar(area, SWT.NONE);
@@ -87,19 +89,37 @@ public class GroupUiProvider implements SwtUiProvider {
 
                ToolItem addItem = new ToolItem(toolBar, SWT.FLAT);
                addItem.setImage(theme.getSmallIcon(SuiteIcon.add));
+               addItem.setEnabled(CurrentUser.implies(org.argeo.cms.auth.CmsSystemRole.groupAdmin, hierarchyUnit.getBase()));
+
+               // members view
+               SwtTableView<Content, Content> membersView = new SwtTableView<>(area, SWT.BORDER, membersPart);
+               membersView.setLayoutData(CmsSwtUtils.fillAll());
+               membersView.refresh();
+
+               // CONTROLLER
+               membersPart.onSelected((model) -> {
+                       deleteItem.setEnabled(CurrentUser.implies(org.argeo.cms.auth.CmsSystemRole.groupAdmin, hierarchyUnit.getBase()));
+                       deleteItem.setData(model);
+               });
+
                addItem.addSelectionListener((Selected) (e) -> {
                        ChooseUserDialog chooseUserDialog = new ChooseUserDialog(parent.getDisplay().getActiveShell(),
                                        SuiteMsg.chooseAMember.lead(), contentSession, cmsUserManager, hierarchyUnit);
                        if (chooseUserDialog.open() == CmsDialog.OK) {
                                Content chosen = chooseUserDialog.getSelected();
-                               // TODO add
+                               cmsUserManager.addMember(context.adapt(CmsGroup.class), chosen.adapt(CmsUser.class));
+                               membersPart.refresh();
+                       }
+               });
+
+               deleteItem.addSelectionListener((Selected) (e) -> {
+                       if (deleteItem.getData() != null) {
+                               Content chosen = (Content) deleteItem.getData();
+                               cmsUserManager.removeMember(context.adapt(CmsGroup.class), chosen.adapt(CmsUser.class));
+                               membersPart.refresh();
                        }
                });
 
-               // members view
-               SwtTableView<Content, Content> membersView = new SwtTableView<>(area, SWT.BORDER, membersPart);
-               membersView.setLayoutData(CmsSwtUtils.fillAll());
-               membersView.refresh();
                return membersView;
 
        }