X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUsersEntryArea.java;fp=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUsersEntryArea.java;h=bcbdd121653fd46f42a62e7ed8c9c6ec5ab8b67f;hb=a7fa345a6f29787468392a0e739aa16d882e1443;hp=1ce5ab231daea8249810f989efd3e6a898368308;hpb=3c2aa2f5daacf09af35b83d8261c3c716e4158d8;p=gpl%2Fargeo-suite.git diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java index 1ce5ab2..bcbdd12 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java @@ -27,10 +27,10 @@ import org.argeo.cms.swt.widgets.SwtTabularPart; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ux.widgets.HierarchicalPart; import org.argeo.cms.ux.widgets.TabularPart; -import org.argeo.osgi.useradmin.HierarchyUnit; import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.LangUtils; import org.argeo.util.directory.FunctionalGroup; +import org.argeo.util.directory.HierarchyUnit; import org.argeo.util.directory.Organization; import org.argeo.util.directory.Person; import org.eclipse.jface.window.Window; @@ -144,9 +144,10 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { HierarchyUnit hu = (HierarchyUnit) getInput(); if (hu == null) return 0; + UserDirectory ud = (UserDirectory) hu.getDirectory(); for (HierarchyUnit directChild : hu.getDirectHierachyUnits(false)) { if (!directChild.isFunctional()) { - for (Role r : directChild.getHierarchyUnitRoles(null, false)) { + for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) { if (r instanceof Person || r instanceof Organization) roles.add(r); }