summaryrefslogtreecommitdiffstats
path: root/server/notifications
diff options
context:
space:
mode:
authorSam X. Chen <sam.xi.chen@gmail.com>2019-09-26 10:53:40 -0400
committerSam X. Chen <sam.xi.chen@gmail.com>2019-09-26 10:53:40 -0400
commit62b72a03c4889377169411c8cdbf372c71cac1af (patch)
tree5328397ddf7ae571038ffe5d201fb2d77eadf742 /server/notifications
parentd5cff1ec48bf9ab13a32576e7495ae54c3d2c0f7 (diff)
downloadwekan-62b72a03c4889377169411c8cdbf372c71cac1af.tar.gz
wekan-62b72a03c4889377169411c8cdbf372c71cac1af.tar.bz2
wekan-62b72a03c4889377169411c8cdbf372c71cac1af.zip
Add feature: Add due timeline into Calendar view
Diffstat (limited to 'server/notifications')
-rw-r--r--server/notifications/email.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/server/notifications/email.js b/server/notifications/email.js
index 0373deb0..acafb4de 100644
--- a/server/notifications/email.js
+++ b/server/notifications/email.js
@@ -13,11 +13,14 @@ Meteor.startup(() => {
const lan = user.getLanguage();
const subject = TAPi18n.__(title, params, lan); // the original function has a fault, i believe the title should be used according to original author
const existing = user.getEmailBuffer().length > 0;
- const text = `${existing ? `<br/>\n${subject}<br/>\n` : ''}${
+ const htmlEnabled =
+ Meteor.settings.public &&
+ Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false;
+ const text = `${existing ? `\n${subject}\n` : ''}${
params.user
- } ${TAPi18n.__(description, quoteParams, lan)}<br/>\n${params.url}`;
+ } ${TAPi18n.__(description, quoteParams, lan)}\n${params.url}`;
- user.addEmailBuffer(text);
+ user.addEmailBuffer(htmlEnabled ? text.replace(/\n/g, '<br/>') : text);
// unlike setTimeout(func, delay, args),
// Meteor.setTimeout(func, delay) does not accept args :-(