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

Fix for #619

Browse source 
Merged parts of PR #651 and fixed the rest
This commit is contained in:
Tomas Bures 2019-08-07 14:29:58 +02:00
parent 5cae9c849c
commit 30e03adf0c
5 changed files with 51 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ export default class CUD extends Component {
];
this.sourceOptions = [];
for (const key in sourceLabelsOrder) {
for (const key of sourceLabelsOrder) {
this.sourceOptions.push({key, label: this.sourceLabels[key]});
}

47
client/src/templates/CUD.js
View file

@ -98,9 +98,13 @@ export default class CUD extends Component {
}
submitFormValuesMutator(data) {
this.templateTypes[data.type].beforeSave(data);
if (data.fromExistingEntity) {
return filterData(data, ['name', 'description', 'namespace', 'fromExistingEntity', 'existingEntity']);
return filterData(data, ['name', 'description', 'type', 'tag_language', 'data', 'html', 'text', 'namespace', 'fromExistingEntity', 'existingEntity']);
} else {
this.templateTypes[data.type].beforeSave(data);
return filterData(data, ['name', 'description', 'type', 'tag_language', 'data', 'html', 'text', 'namespace', 'fromExistingEntity']);
}
}
async getPreSubmitFormValuesUpdater() {
@ -151,27 +155,28 @@ export default class CUD extends Component {
state.setIn(['name', 'error'], t('nameMustNotBeEmpty'));
}
const typeKey = state.getIn(['type', 'value']);
if (!typeKey && !state.getIn(['fromExistingEntity', 'value'])) {
state.setIn(['type', 'error'], t('typeMustBeSelected'));
}else{
state.setIn(['type', 'error'], null);
}
if (!state.getIn(['tag_language', 'value'])) {
state.setIn(['tag_language', 'error'], t('Tag language must be selected'));
}
if (state.getIn(['fromExistingEntity', 'value']) && !state.getIn(['existingEntity', 'value'])) {
state.setIn(['existingEntity', 'error'], t('sourceTemplateMustNotBeEmpty'));
} else {
state.setIn(['existingEntity', 'error'], null);
}
validateNamespace(t, state);
if (typeKey && !state.getIn(['fromExistingEntity', 'value'])) {
this.templateTypes[typeKey].validate(state);
const fromExistingEntity = state.getIn(['fromExistingEntity', 'value']);
if (fromExistingEntity) {
if (!state.getIn(['existingEntity', 'value'])) {
state.setIn(['existingEntity', 'error'], t('sourceTemplateMustNotBeEmpty'));
}
} else {
const typeKey = state.getIn(['type', 'value']);
if (!typeKey) {
state.setIn(['type', 'error'], t('typeMustBeSelected'));
}
if (!state.getIn(['tag_language', 'value'])) {
state.setIn(['tag_language', 'error'], t('Tag language must be selected'));
}
if (typeKey) {
this.templateTypes[typeKey].validate(state);
}
}
}