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

Some fixes

Browse source
This commit is contained in:
Tomas Bures 2019-01-20 16:31:17 +00:00
parent d14942da93
commit 4f408a26d5
9 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/models/campaigns.js
View file

@ -651,7 +651,7 @@ async function enforceSendPermissionTx(tx, context, campaignId) {
const requiredPermission = getSendConfigurationPermissionRequiredForSend(campaign, sendConfiguration);
await shares.enforceEntityPermissionTx(tx, context, 'sendConfiguration', campaign.send_configuration, requiredPermission);
await shares.enforceEntityPermissionTx(tx, context, 'campaign', campaignId, 'send');
await shares.enforceEntityPermissionTx(tx, context, 'campaign', campaign.id, 'send');
}
@ -853,7 +853,7 @@ async function _changeStatus(context, campaignId, permittedCurrentStates, newSta
throw new interoperableErrors.NotFoundError();
}
await enforceSendPermissionTx(tx, context, campaign);
await enforceSendPermissionTx(tx, context, entity);
if (!permittedCurrentStates.includes(entity.status)) {
throw new interoperableErrors.InvalidStateError(invalidStateMessage);

3
server/models/forms.js
View file

@ -10,8 +10,7 @@ const namespaceHelpers = require('../lib/namespace-helpers');
const fs = require('fs-extra');
const path = require('path');
const mjml = require('mjml');
const mjml2html = mjml.default;
const mjml2html = require('mjml');
const lists = require('./lists');
const dependencyHelpers = require('../lib/dependency-helpers');