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

Fix wrong rebase

Browse Source
This commit is contained in:
Kamal Bennani 2018-11-18 23:56:02 +01:00
parent da5ca2a125
commit 85eeb4aef2
No known key found for this signature in database
GPG Key ID: 4513063CDB1A1C25
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,8 +113,8 @@ module.exports = {
} else { } else {
const model = association.plugin const model = association.plugin
? strapi.plugins[association.plugin].models[ ? strapi.plugins[association.plugin].models[
association.collection || association.model association.collection || association.model
] ]
: strapi.models[association.collection || association.model]; : strapi.models[association.collection || association.model];
// Generate lookup for this relation // Generate lookup for this relation

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

@ -398,11 +398,11 @@ module.exports = {
queryOpts.skip = convertedParams.start; queryOpts.skip = convertedParams.start;
switch (association.nature) { switch (association.nature) {
case 'manyToMany': { case "manyToMany":
const arrayOfIds = (obj[association.alias] || []).map( const arrayOfIds = (obj[association.alias] || []).map(
related => { related => {
return related[ref.primaryKey] || related; return related[ref.primaryKey] || related;
}, }
); );
// Where. // Where.