X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FPeopleEntryArea.java;h=81463a2417431cba75a03f9fbe5da95ae34ad43c;hb=b4debb80c8209d35f546da421020449a5d84049a;hp=b9f2d9e1d439d845c2ea2735155b9dfecc63f009;hpb=d95290bc51c906c09675cb60cccd93529cab7ba4;p=gpl%2Fargeo-suite.git diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java index b9f2d9e..81463a2 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java @@ -9,16 +9,21 @@ import javax.jcr.RepositoryException; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentRepository; import org.argeo.api.acr.ContentSession; +import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapObjs; +import org.argeo.api.cms.directory.Directory; +import org.argeo.api.cms.directory.HierarchyUnit; import org.argeo.api.cms.ux.CmsIcon; import org.argeo.api.cms.ux.CmsView; -import org.argeo.app.ui.SuiteEvent; import org.argeo.app.ui.SuiteIcon; +import org.argeo.app.ui.SuiteUxEvent; import org.argeo.cms.CmsUserManager; import org.argeo.cms.acr.ContentUtils; import org.argeo.cms.auth.CmsRole; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.jcr.acr.JcrContent; +import org.argeo.cms.osgi.useradmin.UserDirectory; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; @@ -32,11 +37,6 @@ import org.argeo.cms.ux.widgets.Column; import org.argeo.cms.ux.widgets.DefaultTabularPart; import org.argeo.cms.ux.widgets.GuidedForm; import org.argeo.cms.ux.widgets.HierarchicalPart; -import org.argeo.osgi.useradmin.UserDirectory; -import org.argeo.util.directory.HierarchyUnit; -import org.argeo.util.directory.ldap.IpaUtils; -import org.argeo.util.naming.LdapAttrs; -import org.argeo.util.naming.LdapObjs; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; @@ -66,16 +66,6 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { SashForm sashForm = new SashForm(parent, SWT.VERTICAL); CmsSwtUtils.fill(sashForm); - // MODEL -// List directories = new ArrayList<>(); -// // List orgs = cmsUserManager.listGroups(null, true, false); -// for (UserDirectory directory : cmsUserManager.getUserDirectories()) { -// if (CurrentUser.implies(CmsRole.userAdmin, directory.getContext())) { -// directories.add(directory); -// } -// -// } - // VIEW HierarchicalPart hierarchyPart = new AbstractHierarchicalPart<>() { @@ -83,23 +73,15 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { public List getChildren(HierarchyUnit parent) { List visible = new ArrayList<>(); if (parent != null) { + if (parent instanceof Directory) // do no show children of the directories + return visible; for (HierarchyUnit hu : parent.getDirectHierarchyUnits(true)) { - // if parent was visible, it is visible - // TODO restrict more? - -// if (CurrentUser.implies(CmsRole.userAdmin, hu.getBase()) // -// ) // IPA -// { visible.add(hu); -// } } } else { for (UserDirectory directory : cmsUserManager.getUserDirectories()) { - if (CurrentUser.implies(CmsRole.userAdmin, directory.getBase()) // - || CurrentUser.implies(CmsRole.userAdmin, - IpaUtils.IPA_ACCOUNTS_RDN + "," + directory.getBase())) // IPA - { - // TODO show base level + if (CurrentUser.implies(CmsRole.userAdmin, directory.getBase())) { + visible.add(directory); } for (HierarchyUnit hu : directory.getDirectHierarchyUnits(true)) { if (CurrentUser.implies(CmsRole.userAdmin, hu.getBase())) { @@ -129,7 +111,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { } }; - SwtTreeView directoriesView = new SwtTreeView<>(sashForm, SWT.NONE, hierarchyPart); + SwtTreeView directoriesView = new SwtTreeView<>(sashForm, SWT.BORDER, hierarchyPart); DefaultTabularPart usersPart = new DefaultTabularPart<>() { @@ -140,17 +122,16 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { if (ud.getRealm().isPresent()) { for (Role r : ud.getHierarchyUnitRoles(ud, null, true)) { Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r); - // if (r instanceof Person || r instanceof Organization) if (content.hasContentClass(LdapObjs.inetOrgPerson.qName(), LdapObjs.organization.qName())) roles.add(content); } } else { for (HierarchyUnit directChild : hu.getDirectHierarchyUnits(false)) { - if (!directChild.isFunctional()) { + if (!(directChild.isType(HierarchyUnit.Type.FUNCTIONAL) + || directChild.isType(HierarchyUnit.Type.ROLES))) { for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) { Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r); - // if (r instanceof Person || r instanceof Organization) if (content.hasContentClass(LdapObjs.inetOrgPerson.qName(), LdapObjs.organization.qName(), LdapObjs.groupOfNames.qName())) roles.add(content); @@ -197,7 +178,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { }); usersPart.addColumn((Column) (role) -> role.attr(LdapAttrs.mail.qName())); - SwtTableView usersView = new SwtTableView<>(sashForm, SWT.NONE, usersPart); + new SwtTableView<>(sashForm, SWT.BORDER, usersPart); // toolbar Composite bottom = new Composite(parent, SWT.NONE); @@ -219,15 +200,15 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { if (o instanceof HierarchyUnit) { HierarchyUnit hierarchyUnit = (HierarchyUnit) o; usersPart.setInput(hierarchyUnit); - cmsView.sendEvent(SuiteEvent.refreshPart.topic(), - SuiteEvent.eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit))); +// cmsView.sendEvent(SuiteUxEvent.refreshPart.topic(), SuiteUxEvent +// .eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit))); } }); usersPart.onSelected((o) -> { Content user = (Content) o; if (user != null) { - cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user)); + cmsView.sendEvent(SuiteUxEvent.refreshPart.topic(), SuiteUxEvent.eventProperties(user)); deleteItem.setEnabled(true); } else { deleteItem.setEnabled(false); @@ -237,7 +218,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { usersPart.onAction((o) -> { Content user = (Content) o; if (user != null) { - cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(user)); + cmsView.sendEvent(SuiteUxEvent.openNewPart.topic(), SuiteUxEvent.eventProperties(user)); } }); @@ -258,20 +239,6 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { return sashForm; } -// static String getProperty(Role role, LdapAttrs attr) { -// Object value = role.getProperties().get(attr.name()); -// return value != null ? value.toString() : null; -// } - -// private boolean isOrganisation(Role role) { -// String[] objectClasses = role.getProperties().get(LdapAttrs.objectClasses.name()).toString().split("\\n"); -// for (String objectClass : objectClasses) { -// if (LdapObjs.organization.name().equalsIgnoreCase(objectClass)) -// return true; -// } -// return false; -// } - public void setCmsUserManager(CmsUserManager cmsUserManager) { this.cmsUserManager = cmsUserManager; }