From ccb3b3de38dc602d2427c0df7477ad50f4787220 Mon Sep 17 00:00:00 2001 From: kirrg001 Date: Tue, 9 Jan 2018 21:38:13 +0100 Subject: [PATCH] Fixed 1.20 migration script no issue - `models.Settings.destroy` only accepts one argument --- .../data/migrations/versions/1.20/1-remove-settings-keys.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js b/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js index aed7370b80..a6346eb515 100644 --- a/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js +++ b/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js @@ -21,7 +21,7 @@ module.exports.up = function removeSettingKeys(options) { } common.logging.info('Deleted Settings Key `display_update_notification`.'); - return models.Settings.destroy({id: settingsModel.id}, localOptions); + return models.Settings.destroy(_.merge({id: settingsModel.id}, localOptions)); }) .then(function () { return models.Settings.findOne({key: 'seen_notifications'}, localOptions); @@ -33,7 +33,7 @@ module.exports.up = function removeSettingKeys(options) { } common.logging.info('Deleted Settings Key `seen_notifications`.'); - return models.Settings.destroy({id: settingsModel.id}, localOptions); + return models.Settings.destroy(_.merge({id: settingsModel.id}, localOptions)); }); };