Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 15:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: {username} not working in notification.tpl

Browse Source 
fix images going out of notification email
This commit is contained in:
Barış Soner Uşaklı
2019-05-21 22:48:50 -04:00
parent 3b0459a0a5
commit f55cc66723
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/emailer.js
View File

@@ -199,18 +199,19 @@ Emailer.send = function (template, uid, params, callback) {
async.waterfall([ async.waterfall([
function (next) { function (next) {
async.parallel({ async.parallel({
email: async.apply(User.getUserField, uid, 'email'), userData: async.apply(User.getUserFields, uid, ['email', 'username']),
settings: async.apply(User.getSettings, uid), settings: async.apply(User.getSettings, uid),
}, next); }, next);
}, },
async function (results) { async function (results) {
if (!results.email) { if (!results.userData || !results.userData.email) {
winston.warn('uid : ' + uid + ' has no email, not sending.'); winston.warn('uid : ' + uid + ' has no email, not sending.');
return; return;
} }
params.uid = uid; params.uid = uid;
params.username = results.userData.username;
params.rtl = await translator.translate('[[language:dir]]', results.settings.userLang) === 'rtl'; params.rtl = await translator.translate('[[language:dir]]', results.settings.userLang) === 'rtl';
Emailer.sendToEmail(template, results.email, results.settings.userLang, params, function () {}); Emailer.sendToEmail(template, results.userData.email, results.settings.userLang, params, function () {});
}, },
], function (err) { ], function (err) {
return callback(err); return callback(err);

4
src/views/emails/notification.tpl
View File

@@ -17,9 +17,9 @@
<h1 style="margin: 0 0 10px 0; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 18px; line-height: 21px; color: #aaaaaa; font-weight: normal;">{intro}</h1> <h1 style="margin: 0 0 10px 0; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 18px; line-height: 21px; color: #aaaaaa; font-weight: normal;">{intro}</h1>
</td> </td>
</tr> </tr>
<tr> <tr class="notification-body">
<td style="padding: 20px 40px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #555555;"> <td style="padding: 20px 40px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #555555;">
<p class="notification-body" style="margin: 0; padding: 6px 0px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 13px; line-height: 26px; color: #666666;"> <p style="margin: 0; padding: 6px 0px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 13px; line-height: 26px; color: #666666;">
{body} {body}
</p> </p>
</td> </td>