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

Initial draft of installation scripts for CentOS 8

Browse source 
Fixed bug in cancelling scheduled send - If campaign was scheduled to be sent, a checkbox was still shown on the campaign status page. This gave wrong impression that by unchecking the checkbox, the scheduling is cancelled. Checkbox is removed now and the "Pause" button has be renamed to "Cancel scheduling"

Added default role for campaign admin that administer multiple namespaces.
This commit is contained in:
Tomas Bures 2020-04-12 16:52:19 +02:00
parent f323033da7
commit 665a0d0614
6 changed files with 85 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/campaigns/Status.js
View file

@ -419,7 +419,9 @@ class SendControls extends Component {
content = (
<Form stateOwner={this}>
<CheckBox id="sendLater" label={t('sendLater')} text={t('scheduleDeliveryAtAParticularDatetime')}/>
{entity.status !== CampaignStatus.SCHEDULED &&
<CheckBox id="sendLater" label={t('sendLater')} text={t('scheduleDeliveryAtAParticularDatetime')}/>
}
{this.getFormValue('sendLater') &&
<div>
<DatePicker id="date" label={t('date')} />
@ -440,7 +442,7 @@ class SendControls extends Component {
:
<Button className="btn-primary" icon="play" label={t('send')} onClickAsync={::this.confirmStart}/>
}
{entity.status === CampaignStatus.SCHEDULED && <Button className="btn-primary" icon="pause" label={t('Pause')} onClickAsync={::this.stopAsync}/>}
{entity.status === CampaignStatus.SCHEDULED && <Button className="btn-primary" icon="pause" label={t('Cancel scheduling')} onClickAsync={::this.stopAsync}/>}
{entity.status === CampaignStatus.PAUSED && <Button className="btn-primary" icon="redo" label={t('reset')} onClickAsync={::this.resetAsync}/>}
{entity.status === CampaignStatus.PAUSED && <LinkButton className="btn-secondary" icon="signal" label={t('viewStatistics')} to={`/campaigns/${entity.id}/statistics`}/>}
</>