yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-06 04:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'alpha.4' of https://github.com/strapi/strapi into plugin/content-manager

Browse Source
This commit is contained in:
Pierre Burgy 2017-04-20 18:45:02 +02:00
commit 41e4031f53
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/strapi-bookshelf/lib/index.js
View File

@ -395,13 +395,18 @@ module.exports = function(strapi) {
relationship.attribute = pluralize.singular(details.via);
}
const globalId = _.get(
strapi.models,
`${details.collection.toLowerCase()}.globalId`
);
loadedModel[name] = function() {
if (
_.isArray(_.get(details, 'withPivot')) &&
!_.isEmpty(details.withPivot)
) {
return this.belongsToMany(
global[_.upperFirst(details.collection)],
global[globalId],
tableName,
relationship.attribute + '_' + relationship.column,
details.attribute + '_' + details.column
@ -409,7 +414,7 @@ module.exports = function(strapi) {
}
return this.belongsToMany(
global[_.upperFirst(details.collection)],
global[globalId],
tableName,
relationship.attribute + '_' + relationship.column,
details.attribute + '_' + details.column