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

Limit populate object where model is equal

Browse Source
This commit is contained in:
Aurelsicoko 2018-02-12 19:04:36 +01:00
parent 46ff89e404
commit 134fa960cd
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/strapi-mongoose/lib/index.js
View File

@ -106,7 +106,8 @@ module.exports = function (strapi) {
if (this._mongooseOptions.populate && this._mongooseOptions.populate[association.alias]) { if (this._mongooseOptions.populate && this._mongooseOptions.populate[association.alias]) {
if (association.nature === 'oneToMorph' || association.nature === 'manyToMorph') { if (association.nature === 'oneToMorph' || association.nature === 'manyToMorph') {
this._mongooseOptions.populate[association.alias].match = { this._mongooseOptions.populate[association.alias].match = {
[`${association.via}.${association.where}`]: association.alias [`${association.via}.${association.where}`]: association.alias,
[`${association.via}.kind`]: definition.globalId
} }
} else { } else {
this._mongooseOptions.populate[association.alias].path = `${association.alias}.${association.key}`; this._mongooseOptions.populate[association.alias].path = `${association.alias}.${association.key}`;

4
packages/strapi-plugin-users-permissions/models/User.settings.json
View File

@ -36,10 +36,6 @@
"via": "users", "via": "users",
"plugin": "users-permissions", "plugin": "users-permissions",
"configurable": false "configurable": false
},
"avatar": {
"model": "upload",
"via": "related"
} }
} }
} }