Issue 52917: File Browser doesn't load with non-root context path (#6602)

labkey-jeckels · web-flow · commit d005ee61c37a · 2025-04-23T21:23:05.000-07:00
diff --git a/api/src/org/labkey/api/files/view/FilesWebPart.java b/api/src/org/labkey/api/files/view/FilesWebPart.java
@@ -401,7 +401,7 @@ public static URI getRootPath(Container c, @Nullable String davName, @Nullable S
     @NotNull
     private static URI _getRootPath(Container c, @Nullable URI relativePath, boolean skipDavPrefix)
     {
-        String webdavPrefix = skipDavPrefix ? "" : PageFlowUtil.encodeURIComponent(AppProps.getInstance().getContextPath()) + "/" + PageFlowUtil.encodeURIComponent(WebdavService.getServletPath());
+        String webdavPrefix = skipDavPrefix ? "" : (AppProps.getInstance().getContextPath() + "/" + PageFlowUtil.encodeURIComponent(WebdavService.getServletPath()));
         URI rootPath = URIUtil.toURI(webdavPrefix + c.getEncodedPath());
         relativePath = relativePath == null || relativePath.toString().endsWith("/") ?
                 relativePath :

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ public static URI getRootPath(Container c, @Nullable String davName, @Nullable S`
`401`	`401`	`@NotNull`
`402`	`402`	`private static URI _getRootPath(Container c, @Nullable URI relativePath, boolean skipDavPrefix)`
`403`	`403`	`{`
`404`		`- String webdavPrefix = skipDavPrefix ? "" : PageFlowUtil.encodeURIComponent(AppProps.getInstance().getContextPath()) + "/" + PageFlowUtil.encodeURIComponent(WebdavService.getServletPath());`
	`404`	`+ String webdavPrefix = skipDavPrefix ? "" : (AppProps.getInstance().getContextPath() + "/" + PageFlowUtil.encodeURIComponent(WebdavService.getServletPath()));`
`405`	`405`	`URI rootPath = URIUtil.toURI(webdavPrefix + c.getEncodedPath());`
`406`	`406`	`relativePath = relativePath == null \|\| relativePath.toString().endsWith("/") ?`
`407`	`407`	`relativePath :`