diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json index 77edded249..eada0a1ab2 100755 --- a/packages/strapi-mongoose/package.json +++ b/packages/strapi-mongoose/package.json @@ -16,7 +16,7 @@ "main": "./lib", "dependencies": { "lodash": "^4.17.4", - "mongoose": "^5.0.15", + "mongoose": "^5.0.16", "mongoose-float": "^1.0.2", "pluralize": "^6.0.0", "strapi-utils": "3.0.0-alpha.12" @@ -48,4 +48,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-plugin-content-manager/config/queries/bookshelf.js b/packages/strapi-plugin-content-manager/config/queries/bookshelf.js index d67746d21b..ff3187704f 100755 --- a/packages/strapi-plugin-content-manager/config/queries/bookshelf.js +++ b/packages/strapi-plugin-content-manager/config/queries/bookshelf.js @@ -92,9 +92,9 @@ module.exports = { return module.exports.update.call(this, { [this.primaryKey]: entry[this.primaryKey], - values: _.merge({ + values: _.assign({ id: entry[this.primaryKey] - }, params.values) + }, params.values, entry) }); }, diff --git a/packages/strapi-plugin-content-manager/config/queries/mongoose.js b/packages/strapi-plugin-content-manager/config/queries/mongoose.js index 2008eb8e89..e0e7d7b2ce 100755 --- a/packages/strapi-plugin-content-manager/config/queries/mongoose.js +++ b/packages/strapi-plugin-content-manager/config/queries/mongoose.js @@ -35,7 +35,7 @@ module.exports = { return acc; }, {}); - const entry = await this.create(values) + const request = await this.create(values) .catch((err) => { const message = err.message.split('index:'); const field = _.words(_.last(message).split('_')[0]); @@ -44,11 +44,13 @@ module.exports = { throw error; }); + const entry = request.toJSON ? request.toJSON() : request; + return module.exports.update.call(this, { [this.primaryKey]: entry[this.primaryKey], - values: _.merge({ + values: _.assign({ id: entry[this.primaryKey] - }, params.values) + }, params.values, entry) }); },