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;
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;
SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
CmsSwtUtils.fill(sashForm);
- // MODEL
-// List<UserDirectory> directories = new ArrayList<>();
-// // List<User> orgs = cmsUserManager.listGroups(null, true, false);
-// for (UserDirectory directory : cmsUserManager.getUserDirectories()) {
-// if (CurrentUser.implies(CmsRole.userAdmin, directory.getContext())) {
-// directories.add(directory);
-// }
-//
-// }
-
// VIEW
HierarchicalPart<HierarchyUnit> hierarchyPart = new AbstractHierarchicalPart<>() {
public List<HierarchyUnit> getChildren(HierarchyUnit parent) {
List<HierarchyUnit> 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())) {
}
};
- SwtTreeView<HierarchyUnit> directoriesView = new SwtTreeView<>(sashForm, SWT.NONE, hierarchyPart);
+ SwtTreeView<HierarchyUnit> directoriesView = new SwtTreeView<>(sashForm, SWT.BORDER, hierarchyPart);
DefaultTabularPart<HierarchyUnit, Content> usersPart = new DefaultTabularPart<>() {
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);
});
usersPart.addColumn((Column<Content>) (role) -> role.attr(LdapAttrs.mail.qName()));
- SwtTableView<HierarchyUnit, Content> usersView = new SwtTableView<>(sashForm, SWT.NONE, usersPart);
+ new SwtTableView<>(sashForm, SWT.BORDER, usersPart);
// toolbar
Composite bottom = new Composite(parent, SWT.NONE);
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);
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));
}
});
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;
}
projects / gpl / argeo-suite.git / blobdiff