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

Moved Merge Tag Helpers to helpers.js

Browse source 
… to satisfy ESLint top-level module scope.
This commit is contained in:
witzig 2017-03-04 21:50:44 +01:00
parent d9c1d8e595
commit 8fdb2840c4
4 changed files with 81 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

5
routes/campaigns.js
View file

@ -10,6 +10,7 @@ let campaigns = require('../lib/models/campaigns');
let subscriptions = require('../lib/models/subscriptions');
let settings = require('../lib/models/settings');
let tools = require('../lib/tools');
let helpers = require('../lib/helpers');
let striptags = require('striptags');
let passport = require('../lib/passport');
let htmlescape = require('escape-html');
@ -184,13 +185,13 @@ router.get('/edit/:id', passport.csrfProtection, (req, res, next) => {
view = 'campaigns/edit';
}
tools.getDefaultMergeTags((err, defaultMergeTags) => {
helpers.getDefaultMergeTags((err, defaultMergeTags) => {
if (err) {
req.flash('danger', err.message || err);
return res.redirect('/');
}
tools.getListMergeTags(campaign.list, (err, listMergeTags) => {
helpers.getListMergeTags(campaign.list, (err, listMergeTags) => {
if (err) {
req.flash('danger', err.message || err);
return res.redirect('/');