From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 20 Jun 2022 08:36:31 +0000 (+0200)
Subject: Fix get directory content path
X-Git-Tag: v2.3.10~181
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3b4d58678c32d2ca70c79e128e3bde0f6c9cd291;p=lgpl%2Fargeo-commons.git

Fix get directory content path
---

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
index c1ded945a..bd4117ead 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
@@ -39,16 +39,16 @@ public class DirectoryContentProvider implements ContentProvider {
 		List<String> segments = ContentUtils.toPathSegments(relativePath);
 		if (segments.size() == 0)
 			return new UserManagerContent(session);
-		String userDirectoryDn = segments.get(0);
+		String userDirectoryName = segments.get(0);
 		UserDirectory userDirectory = null;
 		userDirectories: for (UserDirectory ud : userManager.getUserDirectories()) {
-			if (userDirectoryDn.equals(ud.getGlobalId())) {
+			if (userDirectoryName.equals(ud.getName())) {
 				userDirectory = ud;
 				break userDirectories;
 			}
 		}
 		if (userDirectory == null)
-			throw new ContentNotFoundException("Cannot find user directory " + userDirectoryDn);
+			throw new ContentNotFoundException("Cannot find user directory " + userDirectoryName);
 		if (segments.size() == 1) {
 			return new DirectoryContent(session, this, userDirectory);
 		} else {
@@ -72,7 +72,7 @@ public class DirectoryContentProvider implements ContentProvider {
 			HierarchyUnit hierarchyUnit = userDirectory.getHierarchyUnit(pathWithinUserDirectory);
 			if (hierarchyUnit == null)
 				throw new ContentNotFoundException(
-						"Cannot find " + pathWithinUserDirectory + " within " + userDirectoryDn);
+						"Cannot find " + pathWithinUserDirectory + " within " + userDirectoryName);
 			return new HierarchyUnitContent(session, this, hierarchyUnit);
 		}
 	}