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

4
server/config/default.yaml
View file

@ -280,6 +280,10 @@ defaultRoles:
description: Under the namespace in which the user is located, the user has all permissions for managing lists, templates and campaigns and the permission to send to send configurations.
permissions: [setupAutomation]
ownNamespaceRole: campaignsAdmin
campaignsAdminWithoutNamespace:
name: Campaigns Admin (multiple namespaces)
description: Has basic set of rights to setup campaigns, edit lists and templates. The particular namespaces to which it has access have to be shared individually
permissions: [setupAutomation]
nobody:
name: None
description: No permissions

2
server/models/campaigns.js
View file

@ -894,7 +894,7 @@ async function start(context, campaignId, extraData) {
}
async function stop(context, campaignId) {
await _changeStatus(context, campaignId, [CampaignStatus.SCHEDULED, CampaignStatus.SENDING], [CampaignStatus.PAUSED, CampaignStatus.PAUSING], 'Cannot stop campaign until it is in SCHEDULED or SENDING state');
await _changeStatus(context, campaignId, [CampaignStatus.SCHEDULED, CampaignStatus.SENDING], [CampaignStatus.IDLE, CampaignStatus.PAUSING], 'Cannot stop campaign until it is in SCHEDULED or SENDING state');
}
async function reset(context, campaignId) {