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

Intial timezone support

Browse source
This commit is contained in:
Andris Reinman 2016-04-29 15:35:00 +03:00
parent 478237e60f
commit ae8a79ea07
5 changed files with 187 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

34
routes/lists.js
View file

@ -18,6 +18,7 @@ let uploads = multer({
});
let csvparse = require('csv-parse');
let fs = require('fs');
let tzlist = require('../lib/tz').list;
router.all('/*', (req, res, next) => {
if (!req.user) {
@ -278,6 +279,18 @@ router.get('/subscription/:id/add', passport.csrfProtection, (req, res) => {
data.customFields = fields.getRow(fieldList, data, false, true);
data.useEditor = true;
data.timezones = Object.keys(tzlist).map(tz => {
let selected = false;
if (tz.toLowerCase().trim() === (data.tz || 'UTC').toLowerCase().trim()) {
selected = true;
}
return {
key: tz,
value: tzlist[tz],
selected
};
});
res.render('lists/subscription/add', data);
});
});
@ -308,6 +321,27 @@ router.get('/subscription/:id/edit/:cid', passport.csrfProtection, (req, res) =>
subscription.useEditor = true;
subscription.isSubscribed = subscription.status === 1;
let tzfound = false;
subscription.timezones = Object.keys(tzlist).map(tz => {
let selected = false;
if (tz.toLowerCase().trim() === (subscription.tz || '').toLowerCase().trim()) {
selected = true;
tzfound = true;
}
return {
key: tz,
value: tzlist[tz],
selected
};
});
if (!tzfound && subscription.tz) {
subscription.timezones.push({
key: subscription.tz,
value: subscription.tz,
selected: true
});
}
res.render('lists/subscription/edit', subscription);
});
});

1
routes/subscription.js
View file

@ -13,7 +13,6 @@ let fields = require('../lib/models/fields');
let subscriptions = require('../lib/models/subscriptions');
let settings = require('../lib/models/settings');
let openpgp = require('openpgp');
let tzlist = require('../lib/tz').list;
router.get('/subscribe/:cid', (req, res, next) => {
subscriptions.subscribe(req.params.cid, req.ip, (err, subscription) => {