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

Updated RSS merge tag reference

Browse source
This commit is contained in:
witzig 2017-05-03 23:13:05 +02:00
parent d555ca44ac
commit 408db13fd4
5 changed files with 48 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/editor-helpers.js
View file

@ -6,7 +6,8 @@ let templates = require('../lib/models/templates');
let campaigns = require('../lib/models/campaigns');
module.exports = {
getResource
getResource,
getMergeTagsForResource
};
function getResource(type, id, callback) {
@ -53,7 +54,7 @@ function getMergeTagsForResource(resource, callback) {
return callback(err.message || err);
}
if (!resource.list) {
if (!Number(resource.list)) {
return callback(null, defaultMergeTags);
}
@ -62,7 +63,17 @@ function getMergeTagsForResource(resource, callback) {
return callback(err.message || err);
}
callback(null, defaultMergeTags.concat(listMergeTags));
if (resource.type !== 2) {
return callback(null, defaultMergeTags.concat(listMergeTags));
}
helpers.getRSSMergeTags((err, rssMergeTags) => {
if (err) {
return callback(err.message || err);
}
callback(null, defaultMergeTags.concat(listMergeTags, rssMergeTags));
});
});
});
}