summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-07-27 15:39:42 +0300
committerLauri Ojansivu <x@xet7.org>2017-07-27 15:39:42 +0300
commit5d24d3de2a52dea97738d941513091efb70b2cf8 (patch)
tree877bb4fc17149db90db467b6862833a09458237a /client/components
parent01928bfe5af504d6e921b59e4070339d86097a28 (diff)
parent66da6362c880864e9a51ab932c9baa9af00b85b7 (diff)
downloadwekan-5d24d3de2a52dea97738d941513091efb70b2cf8.tar.gz
wekan-5d24d3de2a52dea97738d941513091efb70b2cf8.tar.bz2
wekan-5d24d3de2a52dea97738d941513091efb70b2cf8.zip
Merge branch 'GhassenRjab-log-checklist-items' into devel
Add checklist items to activity log. Thanks to GhassenRjab ! Closes #1025
Diffstat (limited to 'client/components')
-rw-r--r--client/components/activities/activities.jade11
1 files changed, 11 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index fad147fc..be12a728 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -31,6 +31,12 @@ template(name="boardActivities")
.activity-checklist(href="{{ card.absoluteUrl }}")
+viewer
= checklist.title
+
+ if($eq activityType 'addChecklistItem')
+ | {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}.
+ .activity-checklist(href="{{ card.absoluteUrl }}")
+ +viewer
+ = checklistItem.title
if($eq activityType 'archivedCard')
| {{{_ 'activity-archived' cardLink}}}.
@@ -117,6 +123,11 @@ template(name="cardActivities")
.activity-checklist
+viewer
= checklist.title
+ if($eq activityType 'addChecklistItem')
+ | {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}.
+ .activity-checklist(href="{{ card.absoluteUrl }}")
+ +viewer
+ = checklistItem.title
if($eq activityType 'addComment')
+inlinedForm(classNames='js-edit-comment')