Merge PR #296 into 16.0

Signed-off-by pedrobaeza
OCA · Feb 18, 2024 · 9d157ea · 9d157ea
2 parents 33526b2 + d849c22
commit 9d157ea
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/dms/static/src/js/views/dms_file_upload.esm.js b/dms/static/src/js/views/dms_file_upload.esm.js
@@ -111,10 +111,16 @@ export const FileUpload = {
             return;
         }
 
-        if (this.props.domain.length === 1) {
-            ctx.default_directory_id = this.props.domain[0][2];
-        } else {
-            ctx.default_directory_id = this.props.domain[2][2];
+        // Search the correct directory_id value according to the domain
+        ctx.default_directory_id = false;
+        if (this.props.domain) {
+            for (const domain_item of this.props.domain) {
+                if (domain_item.length === 3) {
+                    if (domain_item[0] === "directory_id" && domain_item[1] === "=") {
+                        ctx.default_directory_id = domain_item[2];
+                    }
+                }
+            }
         }
 
         if (ctx.default_directory_id === false) {