fix: Bilingual relational field

pluginpal · Apr 22, 2022 · ecedd29 · ecedd29
1 parent 9c56e64
commit ecedd29
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/server/services/core.js b/server/services/core.js
@@ -26,6 +26,13 @@ const getLanguageLinks = async (page, contentType, defaultURL, excludeDrafts) =>
   const links = [];
   links.push({ lang: page.locale, url: defaultURL });
 
+  const populate = ['localizations'].concat(Object.keys(strapi.contentTypes[contentType].attributes).reduce((prev, current) => {
+    if (strapi.contentTypes[contentType].attributes[current].type === 'relation') {
+      prev.push(current);
+    }
+    return prev;
+  }, []));
+
   await Promise.all(page.localizations.map(async (translation) => {
     const translationEntity = await strapi.query(contentType).findOne({
       where: {
@@ -46,8 +53,7 @@ const getLanguageLinks = async (page, contentType, defaultURL, excludeDrafts) =>
           $notNull: true,
         } : {},
       },
-      orderBy: 'id',
-      populate: ['localizations'],
+      populate,
     });
 
     if (!translationEntity) return null;
@@ -141,8 +147,6 @@ const createSitemapEntries = async () => {
     const excludeDrafts = config.excludeDrafts && strapi.contentTypes[contentType].options.draftAndPublish;
 
     const populate = ['localizations'].concat(Object.keys(strapi.contentTypes[contentType].attributes).reduce((prev, current) => {
-
-
       if (strapi.contentTypes[contentType].attributes[current].type === 'relation') {
         prev.push(current);
       }

diff --git a/server/services/pattern.js b/server/services/pattern.js
@@ -26,6 +26,8 @@ const getAllowedFields = (contentType, allowedFields = []) => {
         && field.target
         && field.relation.endsWith('ToOne') // TODO: implement `ToMany` relations (#78).
         && fieldName !== 'localizations'
+        && fieldName !== 'createdBy'
+        && fieldName !== 'updatedBy'
       ) {
         const relation = strapi.contentTypes[field.target];