yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mongo toObject on null objectes

Browse Source
This commit is contained in:
Alexandre Bodin 2019-08-01 15:59:21 +02:00
parent 09761294e9
commit 515d756626
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-hook-bookshelf/lib/relations.js
View File

@ -400,7 +400,7 @@ module.exports = {
transacting,
});
return result.toJSON ? result.toJSON() : result;
return result && result.toJSON ? result.toJSON() : result;
},
async addRelationMorph(params, { transacting } = {}) {

4
packages/strapi-hook-mongoose/lib/relations.js
View File

@ -307,7 +307,9 @@ module.exports = {
[this.primaryKey]: primaryKeyValue,
}).populate(populate);
return updatedEntity.toObject ? updatedEntity.toObject() : updatedEntity;
return updatedEntity && updatedEntity.toObject
? updatedEntity.toObject()
: updatedEntity;
},
addRelationMorph: async function(params) {