Merge pull request #1405 from plone/issue-1404

fix wrong vocabularyUrl lookup when `@@getSource` view is used
plone · Nov 8, 2024 · 9653ec7 · 9653ec7
2 parents a39677c + c0d30d0
commit 9653ec7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/pat/contentbrowser/src/App.svelte b/src/pat/contentbrowser/src/App.svelte
@@ -56,7 +56,7 @@
         } else {
             // no path available. try to determine path from vocabularyUrl
             const vocabPath = new URL(vocabularyUrl).pathname.split("/");
-            rootPath = contextPath = $currentPath = vocabPath.slice(0, vocabPath.length - 1).join("/");
+            rootPath = contextPath = $currentPath = vocabPath.slice(0, vocabPath.length - 1).join("/") || "/";
         }
     }
 

diff --git a/src/pat/contentbrowser/src/utils.js b/src/pat/contentbrowser/src/utils.js
@@ -88,7 +88,7 @@ export async function request({
         }
     };
 
-    let url = `${vocabularyUrl}&query=${JSON.stringify(
+    let url = `${vocabularyUrl}${vocabularyUrl.indexOf("?") !== -1 ? "&" : "?"}query=${JSON.stringify(
         vocabQuery
     )}&attributes=${JSON.stringify(attributes)}&batch=${JSON.stringify({
         page: page,