Decorrelate directory implementation from user admin

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / acr / directory / HierarchyUnitContent.java

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
index 78bc72f5d041912a68bfa87c741ed3c7c8acc382..f6a0e3b5266d30f6f1d411e2dd6357a41a6fd644 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
@@ -13,7 +13,8 @@ import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.acr.AbstractContent;
-import org.argeo.osgi.useradmin.HierarchyUnit;
+import org.argeo.osgi.useradmin.UserDirectory;
+import org.argeo.util.directory.HierarchyUnit;
 import org.osgi.service.useradmin.Role;
 
 class HierarchyUnitContent extends AbstractContent {
@@ -59,7 +60,8 @@ class HierarchyUnitContent extends AbstractContent {
                for (HierarchyUnit hu : hierarchyUnit.getDirectHierachyUnits(false))
                        lst.add(new HierarchyUnitContent(getSession(), provider, hu));
 
-               for (Role role : hierarchyUnit.getHierarchyUnitRoles(null, false))
+               for (Role role : ((UserDirectory) hierarchyUnit.getDirectory()).getHierarchyUnitRoles(hierarchyUnit, null,
+                               false))
                        lst.add(new RoleContent(getSession(), provider, this, role));
                return lst.iterator();
        }
@@ -82,5 +84,4 @@ class HierarchyUnitContent extends AbstractContent {
                return hierarchyUnit;
        }
 
-       
 }