Fix related items in get call.

robgietema · Mar 25, 2024 · 1492e2d · 1492e2d
1 parent 50c5c3b
commit 1492e2d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - Fix project vocabularies @robgietema
 - Fix password reset link @robgietema
 - Fix serving videos @robgietema
+- Fix related items in get call @robgietema
 
 ### Internal
 

diff --git a/src/models/document/document.js b/src/models/document/document.js
@@ -399,7 +399,12 @@ export class Document extends Model {
       const relationListFields = this._type.getFactoryFields('Relation List');
       mapSync(relationListFields, async (field) => {
         // Check if related documents
-        if (isArray(json[field]) && json[field].length > 0) {
+        if (
+          isArray(json[field]) &&
+          json[field].length > 0 &&
+          this._relationLists &&
+          this.relationLists[field]
+        ) {
           json[field] = this._relationLists[field].map((document) => ({
             '@id': document.path,
             UID: document.uuid,

diff --git a/src/routes/content/content.js b/src/routes/content/content.js
@@ -295,7 +295,11 @@ export default [
         if (req.document._children) {
           await Promise.all(
             req.document._children.map(
-              async (child) => await child.fetchRelated('_catalog', trx),
+              async (child) =>
+                await Promise.all(
+                  child.fetchRelated('_catalog', trx),
+                  child.fetchRelationLists(trx),
+                ),
             ),
           );
         }