Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #2615 from whowillcare/master

Browse source 
Time line is missing delete/edit comments
This commit is contained in:
Lauri Ojansivu 2019-08-14 19:36:39 +03:00 • committed by GitHub
commit d295cb8385
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/components/activities/activities.jade
View file

@ -201,6 +201,7 @@ template(name="cardActivities")
.activity-checklist(href="{{ card.absoluteUrl }}") .activity-checklist(href="{{ card.absoluteUrl }}")
+viewer +viewer
= checklistItem.title = checklistItem.title
if(currentData.timeKey) if(currentData.timeKey)
| {{{_ activityType }}} | {{{_ activityType }}}
= ' ' = ' '
@ -215,6 +216,10 @@ template(name="cardActivities")
| {{{_ activityType currentData.timeValue}}} | {{{_ activityType currentData.timeValue}}}
if($eq activityType 'deleteComment')
| {{{_ 'activity-deleteComment' currentData.commentId}}}.
if($eq activityType 'editComment')
| {{{_ 'activity-editComment' currentData.commentId}}}.
if($eq activityType 'addComment') if($eq activityType 'addComment')
+inlinedForm(classNames='js-edit-comment') +inlinedForm(classNames='js-edit-comment')
+editor(autofocus=true) +editor(autofocus=true)

2
i18n/en.i18n.json
View file

@ -73,6 +73,8 @@
"activity-unchecked-item-card": "unchecked %s in checklist %s", "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-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-checklist-uncompleted-card": "uncompleted the checklist %s",
"activity-editComment": "edited comment %s",
"activity-deleteComment": "deleted comment %s",
"add-attachment": "Add Attachment", "add-attachment": "Add Attachment",
"add-board": "Add Board", "add-board": "Add Board",
"add-card": "Add Card", "add-card": "Add Card",

4
server/notifications/email.js
View file

@ -13,9 +13,9 @@ Meteor.startup(() => {
const lan = user.getLanguage(); 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 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 existing = user.getEmailBuffer().length > 0;
const text = `${existing ? `\n${subject}\n` : ''}${ const text = `${existing ? `<br/>\n${subject}<br/>\n` : ''}${
params.user params.user
} ${TAPi18n.__(description, quoteParams, lan)}\n${params.url}`; } ${TAPi18n.__(description, quoteParams, lan)}<br/>\n${params.url}`;
user.addEmailBuffer(text); user.addEmailBuffer(text);