Merge pull request #1092 from strapi/upload/bookshelf

Fix loosing of morph relations on update in CM with Bookshelf
strapi · May 3, 2018 · 750167a · 750167a
2 parents 899faec + 902ea63
commit 750167a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/strapi-plugin-content-manager/config/queries/bookshelf.js b/packages/strapi-plugin-content-manager/config/queries/bookshelf.js
@@ -263,7 +263,7 @@ module.exports = {
               }
 
               if (association.type === 'model' || (association.type === 'collection' && _.isObject(array))) {
-                return _.isEmpty(array) ? [] : transformToArrayID([array]);
+                return _.isEmpty(_.toString(array)) ? [] : transformToArrayID([array]);
               }
 
               return [];

diff --git a/packages/strapi-utils/lib/models.js b/packages/strapi-utils/lib/models.js
@@ -103,7 +103,7 @@ module.exports = {
         // We have to find if they are a model linked to this key
         _.forIn(allModels, model => {
           _.forIn(model.attributes, attribute => {
-            if (attribute.hasOwnProperty('via') && attribute.via === key) {
+            if (attribute.hasOwnProperty('via') && attribute.via === key && attribute.model === currentModelName) {
               if (attribute.hasOwnProperty('collection')) {
                 types.other = 'collection';