From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 22 Jun 2022 08:05:23 +0000 (+0200)
Subject: Fix display issue
X-Git-Tag: v2.3.8~86
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=a7fa345a6f29787468392a0e739aa16d882e1443

Fix display issue
---

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);
 						}