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

Fix conflict

Browse Source
This commit is contained in:
cyril lopez 2017-12-13 16:47:35 +01:00
commit b541e6cc4f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-bookshelf/lib/utils/index.js
View File

@ -36,7 +36,7 @@ module.exports = {
} catch (e) { } catch (e) {
// Collection undefined try to get the collection based on collectionIdentity // Collection undefined try to get the collection based on collectionIdentity
if (typeof strapi !== 'undefined') { if (typeof strapi !== 'undefined') {
collection = _.get(strapi.bookshelf.collections, collectionIdentity); collection = _.get(strapi, `bookshelf.collections.${collectionIdentity}`);
} }
// Impossible to match collectionIdentity before, try to use idAttribute // Impossible to match collectionIdentity before, try to use idAttribute

2
packages/strapi-plugin-content-manager/config/queries/bookshelf.js
View File

@ -211,6 +211,7 @@ module.exports = {
switch (association.nature) { switch (association.nature) {
case 'oneToOne': case 'oneToOne':
case 'oneToMany': case 'oneToMany':
case 'manyToOne':
return module.exports.update.call(this, params); return module.exports.update.call(this, params);
case 'manyToMany': case 'manyToMany':
return this.forge({ return this.forge({
@ -233,6 +234,7 @@ module.exports = {
switch (association.nature) { switch (association.nature) {
case 'oneToOne': case 'oneToOne':
case 'oneToMany': case 'oneToMany':
case 'manyToOne':
return module.exports.update.call(this, params); return module.exports.update.call(this, params);
case 'manyToMany': case 'manyToMany':
return this.forge({ return this.forge({