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

Mosaico upgraded to 0.17.5

Browse source 
Work started on confirmation dialogs displayed when one navigates from a page with unsaved changes
This commit is contained in:
Tomas Bures 2019-05-08 19:54:19 +02:00
parent 4f77272042
commit 48dcf2c701
399 changed files with 4032 additions and 77702 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/models/shares.js
View file

@ -25,8 +25,10 @@ async function listByEntityDTAjax(context, entityTypeId, entityId, params) {
builder => builder
.from(entityType.sharesTable)
.innerJoin('users', entityType.sharesTable + '.user', 'users.id')
.innerJoin('generated_role_names', 'generated_role_names.role', 'users.role')
.where('generated_role_names.entity_type', entityTypeId)
.innerJoin('generated_role_names', {
'generated_role_names.role': entityType.sharesTable + '.role',
'generated_role_names.entity_type': knex.raw('?', [entityTypeId])
})
.where(`${entityType.sharesTable}.entity`, entityId),
['users.username', 'users.name', 'generated_role_names.name', 'users.id', entityType.sharesTable + '.auto']
);