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

Editing of triggers seems to work.

Browse source 
Some further fixes.
This commit is contained in:
Tomas Bures 2018-08-04 15:00:37 +05:30
parent ffc26a4836
commit 965f30cea7
23 changed files with 855 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

14
models/lists.js
View file

@ -10,6 +10,7 @@ const shares = require('./shares');
const namespaceHelpers = require('../lib/namespace-helpers');
const fields = require('./fields');
const segments = require('./segments');
const entitySettings = require('../lib/entity-settings');
const UnsubscriptionMode = require('../shared/lists').UnsubscriptionMode;
@ -21,6 +22,8 @@ function hash(entity) {
async function listDTAjax(context, params) {
const campaignEntityType = entitySettings.getEntityType('campaign');
return await dtHelpers.ajaxListWithPermissions(
context,
[{ entityTypeId: 'list', requiredOperations: ['view'] }],
@ -28,7 +31,16 @@ async function listDTAjax(context, params) {
builder => builder
.from('lists')
.innerJoin('namespaces', 'namespaces.id', 'lists.namespace'),
['lists.id', 'lists.name', 'lists.cid', 'lists.subscribers', 'lists.description', 'namespaces.name']
['lists.id', 'lists.name', 'lists.cid', 'lists.subscribers', 'lists.description', 'namespaces.name',
{ query: builder =>
builder.from('campaigns')
.whereRaw('campaigns.list = lists.id')
.innerJoin(campaignEntityType.permissionsTable, 'campaigns.id', `${campaignEntityType.permissionsTable}.entity`)
.where(`${campaignEntityType.permissionsTable}.operation`, 'viewTriggers')
.innerJoin('triggers', 'campaigns.id', 'triggers.campaign')
.count()
}
]
);
}