yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 13:45:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into clean-assets

Browse Source
This commit is contained in:
Alexandre BODIN 2019-12-17 09:12:22 +01:00 committed by GitHub
commit a9ff593b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/strapi-connector-bookshelf/lib/populate.js
View File

@ -46,7 +46,16 @@ const populateAssociations = (definition, { prefix = '' } = {}) => {
const populateBareAssociations = (definition, { prefix = '' } = {}) => { const populateBareAssociations = (definition, { prefix = '' } = {}) => {
return definition.associations return definition.associations
.filter(ast => ast.autoPopulate !== false) .filter(ast => ast.autoPopulate !== false)
.map(assoc => `${prefix}${assoc.alias}`); .map(assoc => {
if (isPolymorphic({ assoc })) {
return formatPolymorphicPopulate({
assoc,
prefix,
});
}
return `${prefix}${assoc.alias}`;
});
}; };
const formatAssociationPopulate = ({ assoc, prefix = '' }) => { const formatAssociationPopulate = ({ assoc, prefix = '' }) => {