X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FHierarchyUnitContent.java;fp=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FHierarchyUnitContent.java;h=e4c637f20b8fd2fca0cdccaf0f295e3594d2f8e0;hp=5acf8ab63fc07711f1956ed4fa3380c952f294a5;hb=654cb2ca43dd4513a4d6a5bbe81762eaf6675496;hpb=a00a744d8ada0bbbeadc2b99fa56033856506e68 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 5acf8ab63..e4c637f20 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java @@ -10,13 +10,12 @@ import javax.xml.namespace.QName; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentName; -import org.argeo.api.acr.CrName; import org.argeo.api.acr.DName; import org.argeo.api.acr.spi.ProvidedSession; import org.argeo.api.cms.directory.CmsDirectory; +import org.argeo.api.cms.directory.CmsRole; import org.argeo.api.cms.directory.HierarchyUnit; import org.argeo.api.cms.directory.UserDirectory; -import org.osgi.service.useradmin.Role; class HierarchyUnitContent extends AbstractDirectoryContent { private HierarchyUnit hierarchyUnit; @@ -58,7 +57,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent { for (HierarchyUnit hu : hierarchyUnit.getDirectHierarchyUnits(false)) lst.add(new HierarchyUnitContent(getSession(), provider, hu)); - for (Role role : ((UserDirectory) hierarchyUnit.getDirectory()).getHierarchyUnitRoles(hierarchyUnit, null, + for (CmsRole role : ((UserDirectory) hierarchyUnit.getDirectory()).getHierarchyUnitRoles(hierarchyUnit, null, false)) lst.add(new RoleContent(getSession(), provider, this, role)); return lst.iterator();