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

Fixes

Browse source 
- Mailtrain would not start if built-in ZoneMTA had to retry the startup
- Campaign list showed "Sending" instead of "Scheduled" for scheduled campaigns
This commit is contained in:
Tomas Bures 2020-08-02 15:19:24 +02:00
parent 8dab13d903
commit 87c6cfa656
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ export default class List extends Component {
title: t('status'), title: t('status'),
render: (data, display, rowData) => { render: (data, display, rowData) => {
if (data === CampaignStatus.SCHEDULED) { if (data === CampaignStatus.SCHEDULED) {
const scheduled = rowData[6]; const scheduled = rowData[7];
if (scheduled && new Date(scheduled) > new Date()) { if (scheduled && new Date(scheduled) > new Date()) {
return t('sendingScheduled'); return t('sendingScheduled');
} else { } else {

2
server/lib/builtin-zone-mta.js
View file

@ -184,7 +184,7 @@ function restart(callback) {
restartBackoffIdx += 1; restartBackoffIdx += 1;
} }
setTimeout(restart, backoffTimeout); setTimeout(restart, backoffTimeout, callback);
}); });
} }