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

Client's public folder renamed to static

Browse source 
Regular campaign sender seems to have most of the code in place. (Not tested.)
This commit is contained in:
Tomas Bures 2018-09-18 10:30:13 +02:00
parent 89eabea0de
commit 63765f7222
354 changed files with 836 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

15
models/fields.js
View file

@ -557,8 +557,7 @@ async function removeAllByListIdTx(tx, context, listId) {
}
}
// Returns an array that can be used for rendering by Handlebars
async function forHbs(context, listId, subscription) { // assumes grouped subscription
function forHbsWithFieldsGrouped(fieldsGrouped, subscription) { // assumes grouped subscription
const customFields = [{
name: 'Email Address',
column: 'email',
@ -569,9 +568,7 @@ async function forHbs(context, listId, subscription) { // assumes grouped subscr
order_manage: -1
}];
const flds = await listGrouped(context, listId);
for (const fld of flds) {
for (const fld of fieldsGrouped) {
const type = fieldTypes[fld.type];
const fldCol = getFieldColumn(fld);
@ -630,6 +627,13 @@ async function forHbs(context, listId, subscription) { // assumes grouped subscr
}
return customFields;
}
// Returns an array that can be used for rendering by Handlebars
async function forHbs(context, listId, subscription) { // assumes grouped subscription
const flds = await listGrouped(context, listId);
return forHbsWithFieldsGrouped(flds, subscription);
}
// Converts subscription data received via (1) POST request from subscription form, (2) via subscribe request to API v1 to subscription structure supported by subscriptions model,
@ -741,6 +745,7 @@ module.exports.remove = remove;
module.exports.removeAllByListIdTx = removeAllByListIdTx;
module.exports.serverValidate = serverValidate;
module.exports.forHbs = forHbs;
module.exports.forHbsWithFieldsGrouped = forHbsWithFieldsGrouped;
module.exports.fromPost = fromPost;
module.exports.fromAPI = fromAPI;
module.exports.fromImport = fromImport;