From b36ce9449baa405703247a51857ac0b63c03d8a4 Mon Sep 17 00:00:00 2001 From: Jim Laurie Date: Wed, 2 Aug 2017 13:56:03 +0200 Subject: [PATCH 1/2] Update get items with nester enabled boolean orbject --- .../controllers/SettingsManager.js | 3 ++- .../services/SettingsManager.js | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js b/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js index f0921dc070..e050cdce8c 100644 --- a/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js +++ b/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js @@ -65,7 +65,8 @@ module.exports = { update: async ctx => { const Service = strapi.plugins['settings-manager'].services.settingsmanager; const { slug, env } = ctx.params; - let params = ctx.request.body; + let params = ctx.request.body.fields; + if (env && _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknown' }] }]); diff --git a/packages/strapi-plugin-settings-manager/services/SettingsManager.js b/packages/strapi-plugin-settings-manager/services/SettingsManager.js index a812fa2f5c..8f9531396c 100644 --- a/packages/strapi-plugin-settings-manager/services/SettingsManager.js +++ b/packages/strapi-plugin-settings-manager/services/SettingsManager.js @@ -598,7 +598,15 @@ module.exports = { return databases; }, - getItems: model => _.flatten(_.map(model.sections, section => section.items)), + getItems: model => { + return _.flatten(_.map(model.sections, section => { + let items = section.items; + + _.forEach(items, item => { if (item.type === 'boolean' && _.has(item, 'items')) items = _.concat(items, item.items) }); + + return items + })); + }, cleanParams: (params, items) => { const cleanParams = {}; From 3aa9683e80d53efa686965c760bec1d8808bbc9b Mon Sep 17 00:00:00 2001 From: Jim Laurie Date: Wed, 2 Aug 2017 15:36:42 +0200 Subject: [PATCH 2/2] Changes for PR validation --- packages/strapi/lib/Strapi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi/lib/Strapi.js b/packages/strapi/lib/Strapi.js index dc4edd3fed..6a9ec49eba 100644 --- a/packages/strapi/lib/Strapi.js +++ b/packages/strapi/lib/Strapi.js @@ -171,7 +171,7 @@ class Strapi extends EventEmitter { reload() { const reload = function() { - if (cluster.isWorker && process.env.NODE_ENV === 'development' && this.config.environments[this.config.environment].server.reload === true) process.send('message'); + if (cluster.isWorker && process.env.NODE_ENV === 'development' && this.config.currentEnvironment.server.autoReload === true) process.send('message'); }; reload.isReloading = false;