From d5ddba2a40f0990beee873763a37d5742eb5dff0 Mon Sep 17 00:00:00 2001 From: Gernot Pansy Date: Thu, 10 Oct 2019 12:32:30 +0200 Subject: [PATCH] Allow select segments on triggered campaigns Don't know why this is disabled. Tested everything and it's working as expected. --- client/src/campaigns/CUD.js | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/client/src/campaigns/CUD.js b/client/src/campaigns/CUD.js index bc0fb9d7..d43f71b0 100644 --- a/client/src/campaigns/CUD.js +++ b/client/src/campaigns/CUD.js @@ -264,7 +264,7 @@ export default class CUD extends Component { for (const lstUid of data.lists) { const prefix = 'lists_' + lstUid + '_'; - const useSegmentation = data[prefix + 'useSegmentation'] && (data.type === CampaignType.REGULAR || data.type === CampaignType.RSS); + const useSegmentation = data[prefix + 'useSegmentation']; lsts.push({ list: data[prefix + 'list'], @@ -426,11 +426,9 @@ export default class CUD extends Component { if (!state.getIn([prefix + 'list', 'value'])) { state.setIn([prefix + 'list', 'error'], t('listMustBeSelected')); } - - if (campaignTypeKey === CampaignType.REGULAR || campaignTypeKey === CampaignType.RSS) { - if (state.getIn([prefix + 'useSegmentation', 'value']) && !state.getIn([prefix + 'segment', 'value'])) { - state.setIn([prefix + 'segment', 'error'], t('segmentMustBeSelected')); - } + + if (state.getIn([prefix + 'useSegmentation', 'value']) && !state.getIn([prefix + 'segment', 'value'])) { + state.setIn([prefix + 'segment', 'error'], t('segmentMustBeSelected')); } } @@ -605,15 +603,12 @@ export default class CUD extends Component {
- - {(campaignTypeKey === CampaignType.REGULAR || campaignTypeKey === CampaignType.RSS) && -
- - {selectedList && this.getFormValue(prefix + 'useSegmentation') && - - } -
- } +
+ + {selectedList && this.getFormValue(prefix + 'useSegmentation') && + + } +
);