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

settings keys in DB converted to camel case

Browse source 
callback-based settings model replaced by async-based settings model
This commit is contained in:
Tomas Bures 2017-12-30 17:27:24 +01:00
parent 6c5c47ac2e
commit d8ee364a4b
22 changed files with 123 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

8
routes/campaigns.js
View file

@ -1,5 +1,8 @@
'use strict';
const { nodeifyFunction } = require('../lib/nodeify');
const getSettings = nodeifyFunction(require('../models/settings').get);
let config = require('config');
let express = require('express');
let router = new express.Router();
@ -7,7 +10,6 @@ let lists = require('../lib/models/lists');
let templates = require('../lib/models/templates');
let campaigns = require('../lib/models/campaigns');
let subscriptions = require('../lib/models/subscriptions');
let settings = require('../lib/models/settings');
let tools = require('../lib/tools');
let editorHelpers = require('../lib/editor-helpers.js');
let striptags = require('striptags');
@ -46,7 +48,7 @@ router.get('/create', passport.csrfProtection, (req, res) => {
data.list = Number(data.list.split(':').shift());
}
settings.list(['defaultFrom', 'defaultAddress', 'defaultSubject'], (err, configItems) => {
getSettings(['defaultFrom', 'defaultAddress', 'defaultSubject'], (err, configItems) => {
if (err) {
req.flash('danger', err.message || err);
return res.redirect('/');
@ -138,7 +140,7 @@ router.get('/edit/:id', passport.csrfProtection, (req, res, next) => {
}
campaign.attachments = attachments;
settings.list(['disableWysiwyg'], (err, configItems) => {
getSettings(['disableWysiwyg'], (err, configItems) => {
if (err) {
return next(err);
}