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=d50d0506a2df1f60ebef25af48500adc3779908a;hb=91e7e55536284e755520f45fe99b6346b283e3f0;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..d50d050 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
@@ -11,8 +11,8 @@ import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
 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;
@@ -33,8 +33,8 @@ 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.Directory;
 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;
@@ -83,23 +83,15 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 			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())) {
@@ -129,7 +121,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 			}
 
 		};
-		SwtTreeView<HierarchyUnit> directoriesView = new SwtTreeView<>(sashForm, SWT.NONE, hierarchyPart);
+		SwtTreeView<HierarchyUnit> directoriesView = new SwtTreeView<>(sashForm, SWT.BORDER, hierarchyPart);
 
 		DefaultTabularPart<HierarchyUnit, Content> usersPart = new DefaultTabularPart<>() {
 
@@ -197,7 +189,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 		});
 		usersPart.addColumn((Column<Content>) (role) -> role.attr(LdapAttrs.mail.qName()));
 
-		SwtTableView<HierarchyUnit, Content> usersView = new SwtTableView<>(sashForm, SWT.NONE, usersPart);
+		SwtTableView<HierarchyUnit, Content> usersView = new SwtTableView<>(sashForm, SWT.BORDER, usersPart);
 
 		// toolbar
 		Composite bottom = new Composite(parent, SWT.NONE);
@@ -219,15 +211,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 +229,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));
 			}
 		});