yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 10:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bug/4104-update-url-of-settings-button-for-content-manager-plugincard

Browse Source
This commit is contained in:
Jim LAURIE 2019-09-26 19:47:55 +02:00 committed by GitHub
commit 2c5ee6d41a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ module.exports = {
return _.set(
acc,
current,
property.map(val => val[assocModel.primaryKey] || val)
property ? property.map(val => val[assocModel.primaryKey] || val) : property
);
}
@ -187,12 +187,12 @@ module.exports = {
return assocModel.updateMany(
{
[assocModel.primaryKey]: {
$in: property.map(
$in: property ? property.map(
val =>
new mongoose.Types.ObjectId(
val[assocModel.primaryKey] || val
)
),
) : property,
},
},
{

4
packages/strapi-plugin-graphql/services/Resolvers.js
View File

@ -172,9 +172,7 @@ const buildAssocResolvers = (model, name, { plugin }) => {
_.set(
queryOpts,
['query', ref.primaryKey],
obj[association.alias].map(val => val[ref.primaryKey] || val) ||
[]
);
(obj[association.alias] ? obj[association.alias].map(val => val[ref.primaryKey] || val) : []));
} else {
_.set(queryOpts, ['query', association.via], obj[ref.primaryKey]);
}