uses document mode even inside sub fields

apostrophecms · Aug 22, 2024 · 86b69c3 · 86b69c3
1 parent ef81718
commit 86b69c3
Showing 1 changed file with 26 additions and 8 deletions.
diff --git a/lib/methods/export.js b/lib/methods/export.js
@@ -201,7 +201,13 @@ module.exports = self => {
     },
 
     async getRelatedDocsFromSchema(req, {
-      doc, schema, relatedTypes, storedData, type = 'relationship', recursion = 0
+      doc,
+      schema,
+      relatedTypes,
+      storedData,
+      type = 'relationship',
+      recursion = 0,
+      mode = doc.aposMode || req.mode
     }) {
       recursion++;
       for (const field of schema) {
@@ -226,7 +232,8 @@ module.exports = self => {
               type,
               relatedTypes,
               recursion,
-              storedData
+              storedData,
+              mode
             });
           }
           continue;
@@ -239,7 +246,8 @@ module.exports = self => {
             type,
             relatedTypes,
             recursion,
-            storedData
+            storedData,
+            mode
           });
           continue;
         }
@@ -253,7 +261,8 @@ module.exports = self => {
               type,
               relatedTypes,
               recursion,
-              storedData
+              storedData,
+              mode
             });
           }
           continue;
@@ -268,14 +277,23 @@ module.exports = self => {
             type,
             storedData,
             shouldRecurse,
-            recursion
+            recursion,
+            mode
           });
         }
       }
     },
 
     async handleRelatedField(req, {
-      doc, field, fieldValue, relatedTypes, type, storedData, shouldRecurse, recursion
+      doc,
+      field,
+      fieldValue,
+      relatedTypes,
+      type,
+      storedData,
+      shouldRecurse,
+      recursion,
+      mode
     }) {
       if (type === 'attachment') {
         if (fieldValue && !storedData.includes(fieldValue._id)) {
@@ -291,10 +309,10 @@ module.exports = self => {
       }
       const criteria = {
         aposDocId: { $in: relatedIds },
-        aposLocale: doc.aposLocale || `${req.locale}:${req.mode}`
+        aposLocale: doc.aposLocale || `${req.locale}:${mode}`
       };
 
-      const clonedReq = doc.aposMode ? req.clone({ mode: doc.aposMode }) : req;
+      const clonedReq = mode ? req.clone({ mode }) : req;
       const foundRelated = await manager
         .findForEditing(clonedReq, criteria)
         .permission('view')