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

Merge remote-tracking branch 'upstream/master' into development

Browse source
This commit is contained in:
Tomas Bures 2018-02-24 23:05:01 +01:00
commit 7750232716
18 changed files with 558 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/models/subscriptions.js
View file

@ -155,6 +155,9 @@ module.exports.insert = (listId, meta, subscriptionData, callback) => {
let entryId = existing ? existing.id : false;
meta.cid = existing ? rows[0].cid : meta.cid;
// meta.status may be 'undefined' or '0' when adding a subscription via API call or CSV import. In both cases meta.partial is 'true'.
// This must either update an existing subscription without changing its status or insert a new subscription with status SUBSCRIBED.
meta.status = meta.status || (existing ? existing.status : Status.SUBSCRIBED);
let statusChange = !existing || existing.status !== meta.status;
@ -618,7 +621,7 @@ module.exports.delete = (listId, cid, callback) => {
module.exports.createImport = (listId, type, path, size, delimiter, emailcheck, mapping, callback) => {
listId = Number(listId) || 0;
type = Number(type) || 1;
type = Number(type) || 0;
if (listId < 1) {
return callback(new Error('Missing List ID'));