public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge of PR #641

Browse source
This commit is contained in:
Tomas Bures 2019-07-23 22:14:35 +05:30
parent ff9191c206
commit b65960b528
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/campaigns/CUD.js
View file

@ -102,9 +102,7 @@ export default class CUD extends Component {
onChange: { onChange: {
send_configuration: ::this.onSendConfigurationChanged send_configuration: ::this.onSendConfigurationChanged
}, },
onChangeBeforeValidation: { onChangeBeforeValidation: ::this.onFormChangeBeforeValidation
data_sourceCustom_type: ::this.onFormChangeBeforeValidation
}
}); });
} }

2
server/models/campaigns.js
View file

@ -572,7 +572,7 @@ async function updateWithConsistencyCheck(context, entity, content) {
} else if (content === Content.WITHOUT_SOURCE_CUSTOM) { } else if (content === Content.WITHOUT_SOURCE_CUSTOM) {
filteredEntity.data.sourceCustom = existing.data.sourceCustom; 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) { } else if (content === Content.ONLY_SOURCE_CUSTOM) {
const data = existing.data; const data = existing.data;