From b65960b52877fbb560aa758c3949026833ebdb3b Mon Sep 17 00:00:00 2001 From: Tomas Bures Date: Tue, 23 Jul 2019 22:14:35 +0530 Subject: [PATCH] Merge of PR #641 --- client/src/campaigns/CUD.js | 4 +--- server/models/campaigns.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/src/campaigns/CUD.js b/client/src/campaigns/CUD.js index 6457a326..f2465c04 100644 --- a/client/src/campaigns/CUD.js +++ b/client/src/campaigns/CUD.js @@ -102,9 +102,7 @@ export default class CUD extends Component { onChange: { send_configuration: ::this.onSendConfigurationChanged }, - onChangeBeforeValidation: { - data_sourceCustom_type: ::this.onFormChangeBeforeValidation - } + onChangeBeforeValidation: ::this.onFormChangeBeforeValidation }); } diff --git a/server/models/campaigns.js b/server/models/campaigns.js index a6d8f815..8cafdcb9 100644 --- a/server/models/campaigns.js +++ b/server/models/campaigns.js @@ -572,7 +572,7 @@ async function updateWithConsistencyCheck(context, entity, content) { } else if (content === Content.WITHOUT_SOURCE_CUSTOM) { filteredEntity.data.sourceCustom = existing.data.sourceCustom; - await namespaceHelpers.validateMove(context, entity, existing, 'campaign', 'createCampaign', 'delete'); // XXX TB - try with entity + await namespaceHelpers.validateMove(context, entity, existing, 'campaign', 'createCampaign', 'delete'); } else if (content === Content.ONLY_SOURCE_CUSTOM) { const data = existing.data;