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

Merge branch 'master' into fix/enumeration

Browse Source
This commit is contained in:
Alexandre BODIN 2020-01-06 12:18:37 +01:00 committed by GitHub
commit cccf256bf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/strapi-connector-mongoose/lib/mount-models.js
View File

@ -8,6 +8,10 @@ const utils = require('./utils');
const relations = require('./relations'); const relations = require('./relations');
const { findComponentByGlobalId } = require('./utils/helpers'); const { findComponentByGlobalId } = require('./utils/helpers');
const isPolymorphicAssoc = assoc => {
return assoc.nature.toLowerCase().indexOf('morph') !== -1;
};
module.exports = ({ models, target, plugin = false }, ctx) => { module.exports = ({ models, target, plugin = false }, ctx) => {
const { instance } = ctx; const { instance } = ctx;
@ -117,7 +121,7 @@ module.exports = ({ models, target, plugin = false }, ctx) => {
*/ */
const morphAssociations = definition.associations.filter( const morphAssociations = definition.associations.filter(
association => association.nature.toLowerCase().indexOf('morph') !== -1 isPolymorphicAssoc
); );
const populateFn = createOnFetchPopulateFn({ const populateFn = createOnFetchPopulateFn({
@ -366,6 +370,7 @@ const createOnFetchPopulateFn = ({
if (definition.modelType === 'component') { if (definition.modelType === 'component') {
definition.associations definition.associations
.filter(assoc => !isPolymorphicAssoc(assoc))
.filter(ast => ast.autoPopulate !== false) .filter(ast => ast.autoPopulate !== false)
.forEach(ast => { .forEach(ast => {
this.populate({ path: ast.alias }); this.populate({ path: ast.alias });