summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-08-14 19:36:39 +0300
committerGitHub <noreply@github.com>2019-08-14 19:36:39 +0300
commitd295cb838522d19c5fcc853a017edff3f1f9e1a5 (patch)
treecff88ae1e68342147ef98ae4b4ae9a20235ee005
parentece011f6aee8ffffe161da2788ab317b78fe388f (diff)
parent7198e6b66eaf622fb8378d928bd8a85df8da7505 (diff)
downloadwekan-d295cb838522d19c5fcc853a017edff3f1f9e1a5.tar.gz
wekan-d295cb838522d19c5fcc853a017edff3f1f9e1a5.tar.bz2
wekan-d295cb838522d19c5fcc853a017edff3f1f9e1a5.zip
Merge pull request #2615 from whowillcare/master
Time line is missing delete/edit comments
-rw-r--r--client/components/activities/activities.jade5
-rw-r--r--i18n/en.i18n.json2
-rw-r--r--server/notifications/email.js4
3 files changed, 9 insertions, 2 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index 5be953b6..deb73072 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -201,6 +201,7 @@ template(name="cardActivities")
.activity-checklist(href="{{ card.absoluteUrl }}")
+viewer
= checklistItem.title
+
if(currentData.timeKey)
| {{{_ activityType }}}
= ' '
@@ -215,6 +216,10 @@ template(name="cardActivities")
| {{{_ activityType currentData.timeValue}}}
+ if($eq activityType 'deleteComment')
+ | {{{_ 'activity-deleteComment' currentData.commentId}}}.
+ if($eq activityType 'editComment')
+ | {{{_ 'activity-editComment' currentData.commentId}}}.
if($eq activityType 'addComment')
+inlinedForm(classNames='js-edit-comment')
+editor(autofocus=true)
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index a513004e..7065396f 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -73,6 +73,8 @@
"activity-unchecked-item-card": "unchecked %s in checklist %s",
"activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
"activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+ "activity-editComment": "edited comment %s",
+ "activity-deleteComment": "deleted comment %s",
"add-attachment": "Add Attachment",
"add-board": "Add Board",
"add-card": "Add Card",
diff --git a/server/notifications/email.js b/server/notifications/email.js
index deb140a6..0373deb0 100644
--- a/server/notifications/email.js
+++ b/server/notifications/email.js
@@ -13,9 +13,9 @@ 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 ? `\n${subject}\n` : ''}${
+ const text = `${existing ? `<br/>\n${subject}<br/>\n` : ''}${
params.user
- } ${TAPi18n.__(description, quoteParams, lan)}\n${params.url}`;
+ } ${TAPi18n.__(description, quoteParams, lan)}<br/>\n${params.url}`;
user.addEmailBuffer(text);