summaryrefslogtreecommitdiffstats
path: root/client
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 /client
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
Diffstat (limited to 'client')
-rw-r--r--client/components/activities/activities.jade5
1 files changed, 5 insertions, 0 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)