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

Campaign status show send settings Bug

Browse source
This commit is contained in:
Carlos 2019-03-13 09:52:02 +01:00
parent 4b1b1a380d
commit 1a61067ff9
9 changed files with 119 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/models/campaigns.js
View file

@ -76,6 +76,19 @@ async function listDTAjax(context, params) {
);
}
async function listByNamespaceDTAjax(context, namespaceId, params) {
return await dtHelpers.ajaxListWithPermissions(
context,
[{ entityTypeId: 'campaign', requiredOperations: ['view'] }],
params,
builder => builder.from('campaigns')
.innerJoin('namespaces', 'namespaces.id', 'campaigns.namespace')
.where('namespaces.id', namespaceId)
.whereNull('campaigns.parent'),
['campaigns.id', 'campaigns.name', 'campaigns.cid', 'campaigns.description', 'campaigns.type', 'campaigns.status', 'campaigns.scheduled', 'campaigns.source', 'campaigns.created', 'namespaces.name']
);
}
async function listChildrenDTAjax(context, campaignId, params) {
return await dtHelpers.ajaxListWithPermissions(
context,
@ -730,9 +743,9 @@ async function changeStatusByCampaignCidAndSubscriptionIdTx(tx, context, campaig
])
.first();
if (!message) {
//if (!message) {
throw new Error('Invalid campaign.')
}
//}
await _changeStatusByMessageTx(tx, context, message, subscriptionStatus);
}
@ -934,6 +947,7 @@ module.exports.Content = Content;
module.exports.hash = hash;
module.exports.listDTAjax = listDTAjax;
module.exports.listByNamespaceDTAjax = listByNamespaceDTAjax;
module.exports.listChildrenDTAjax = listChildrenDTAjax;
module.exports.listWithContentDTAjax = listWithContentDTAjax;
module.exports.listOthersWhoseListsAreIncludedDTAjax = listOthersWhoseListsAreIncludedDTAjax;