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

Work in progress on subscriptions

Browse source
This commit is contained in:
Tomas Bures 2017-08-13 20:11:58 +02:00
parent d9211377dd
commit e73c0a8b28
42 changed files with 1558 additions and 678 deletions
Download patch file Download diff file Expand all files Collapse all files

18
models/forms.js
View file

@ -85,14 +85,12 @@ async function _getById(tx, id) {
async function getById(context, id) {
let entity;
await knex.transaction(async tx => {
return await knex.transaction(async tx => {
shares.enforceEntityPermissionTx(tx, context, 'customForm', id, 'view');
entity = await _getById(tx, id);
entity.permissions = await shares.getPermissions(tx, context, 'customForm', id);
const entity = await _getById(tx, id);
entity.permissions = await shares.getPermissionsTx(tx, context, 'customForm', id);
return entity;
});
return entity;
}
@ -114,8 +112,7 @@ async function serverValidate(context, data) {
async function create(context, entity) {
let id;
await knex.transaction(async tx => {
return await knex.transaction(async tx => {
await shares.enforceEntityPermissionTx(tx, context, 'namespace', entity.namespace, 'createCustomForm');
await namespaceHelpers.validateEntity(tx, entity);
@ -124,7 +121,7 @@ async function create(context, entity) {
enforce(!Object.keys(checkForMjmlErrors(form)).length, 'Error(s) in form templates');
const ids = await tx('custom_forms').insert(filterObject(entity, formAllowedKeys));
id = ids[0];
const id = ids[0];
for (const formKey in form) {
await tx('custom_forms_data').insert({
@ -135,9 +132,8 @@ async function create(context, entity) {
}
await shares.rebuildPermissions(tx, { entityTypeId: 'customForm', entityId: id });
return id;
});
return id;
}
async function updateWithConsistencyCheck(context, entity) {