X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FHierarchyUnitContent.java;h=9ded5ee7b38157fe0b3942d812937f37dfb86ac4;hb=a61a938100ef882c56104e4eb4ea18f7c786c3bc;hp=0ec025ced2c153bfa80170bf497ed4f8cd409021;hpb=55d1a78150b6be0004f6bcb28703bcdd6daf55a1;p=lgpl%2Fargeo-commons.git

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 0ec025ced..9ded5ee7b 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
@@ -13,6 +13,7 @@ import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.osgi.useradmin.UserDirectory;
+import org.argeo.util.directory.Directory;
 import org.argeo.util.directory.HierarchyUnit;
 import org.osgi.service.useradmin.Role;
 
@@ -44,7 +45,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent {
 	@Override
 	public Content getParent() {
 		HierarchyUnit parentHu = hierarchyUnit.getParent();
-		if (parentHu == null) {
+		if (parentHu instanceof Directory) {
 			return new DirectoryContent(getSession(), provider, hierarchyUnit.getDirectory());
 		}
 		return new HierarchyUnitContent(getSession(), provider, parentHu);
@@ -53,7 +54,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent {
 	@Override
 	public Iterator<Content> iterator() {
 		List<Content> lst = new ArrayList<>();
-		for (HierarchyUnit hu : hierarchyUnit.getDirectHierachyUnits(false))
+		for (HierarchyUnit hu : hierarchyUnit.getDirectHierarchyUnits(false))
 			lst.add(new HierarchyUnitContent(getSession(), provider, hu));
 
 		for (Role role : ((UserDirectory) hierarchyUnit.getDirectory()).getHierarchyUnitRoles(hierarchyUnit, null,
@@ -68,7 +69,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent {
 	@Override
 	public List<QName> getContentClasses() {
 		List<QName> contentClasses = super.getContentClasses();
-		contentClasses.add(CrName.COLLECTION.get());
+		contentClasses.add(CrName.collection.qName());
 		return contentClasses;
 	}