yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-08 06:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:strapi/strapi into upload/bookshelf

Browse Source
This commit is contained in:
Aurelsicoko 2018-05-02 17:08:07 +02:00
commit 2fe530e334
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,11 +92,16 @@ module.exports = {
const entry = request.toJSON ? request.toJSON() : request; const entry = request.toJSON ? request.toJSON() : request;
const relations = this.associations.reduce((acc, association) => {
acc[association.alias] = params.values[association.alias];
return acc;
}, {});
return module.exports.update.call(this, { return module.exports.update.call(this, {
[this.primaryKey]: entry[this.primaryKey], [this.primaryKey]: entry[this.primaryKey],
values: _.assign({ values: _.assign({
id: entry[this.primaryKey] id: entry[this.primaryKey]
}, params.values, entry) }, relations)
}); });
}, },

10
packages/strapi-plugin-content-manager/config/queries/mongoose.js
View File

@ -46,11 +46,19 @@ module.exports = {
const entry = request.toJSON ? request.toJSON() : request; const entry = request.toJSON ? request.toJSON() : request;
const relations = this.associations.reduce((acc, association) => {
if (params.values[association.alias]) {
acc[association.alias] = params.values[association.alias];
}
return acc;
}, {});
return module.exports.update.call(this, { return module.exports.update.call(this, {
[this.primaryKey]: entry[this.primaryKey], [this.primaryKey]: entry[this.primaryKey],
values: _.assign({ values: _.assign({
id: entry[this.primaryKey] id: entry[this.primaryKey]
}, params.values, entry) }, relations)
}); });
}, },