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

Beginning of work on templates.

Browse source
This commit is contained in:
Tomas Bures 2018-02-13 23:50:13 +01:00
parent 47b8d80c22
commit 508d6b3b2f
40 changed files with 1685 additions and 1031 deletions
Download patch file Download diff file Expand all files Collapse all files

13
models/fields.js
View file

@ -630,8 +630,14 @@ async function forHbs(context, listId, subscription) { // assumes grouped subscr
return customFields;
}
// Converts subscription data received via POST request from subscription form or via subscribe request to API v1 to subscription structure supported by subscriptions model.
async function fromPost(context, listId, data) { // assumes grouped subscription
// This is to handle option values from API v1
function isSelected(value) {
return ['false', 'no', '0', ''].indexOf((value || '').toString().trim().toLowerCase()) >= 0 ? false : true;
}
const flds = await listGrouped(context, listId);
const subscription = {};
@ -650,7 +656,10 @@ async function fromPost(context, listId, data) { // assumes grouped subscription
for (const optCol in fld.groupedOptions) {
const opt = fld.groupedOptions[optCol];
if (data[fld.key] === opt.key) {
// This handles two different formats for grouped dropdowns and radios.
// The first part of the condition handles the POST requests from the subscription form, while the
// second part handles the subscribe request to API v1
if (data[fld.key] === opt.key || isSelected(data[opt.key])) {
value = opt.column
}
}
@ -660,7 +669,7 @@ async function fromPost(context, listId, data) { // assumes grouped subscription
for (const optCol in fld.groupedOptions) {
const opt = fld.groupedOptions[optCol];
if (data[opt.key]) {
if (isSelected(data[opt.key])) {
value.push(opt.column);
}
}