Fix display issue
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 22 Jun 2022 08:05:23 +0000 (10:05 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 22 Jun 2022 08:05:23 +0000 (10:05 +0200)
org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java

index 1ce5ab231daea8249810f989efd3e6a898368308..bcbdd121653fd46f42a62e7ed8c9c6ec5ab8b67f 100644 (file)
@@ -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);
                                                }