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 #5476 from mfilser/activities_add_back_created_at_field

Browse source 
Activities, adding back "created at" field
This commit is contained in:
Lauri Ojansivu 2024-08-03 00:46:01 +03:00 • committed by GitHub
commit ea9f597685
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,6 @@ template(name="cardActivities")
+activity(activity=activityData card=card mode=mode) +activity(activity=activityData card=card mode=mode)
template(name="editOrDeleteComment") template(name="editOrDeleteComment")
= ' - '
a.js-open-inlined-form {{_ "edit"}} a.js-open-inlined-form {{_ "edit"}}
= ' - ' = ' - '
a.js-delete-comment {{_ "delete"}} a.js-delete-comment {{_ "delete"}}
@ -145,11 +144,10 @@ template(name="activity")
+viewer +viewer
= activity.comment.text = activity.comment.text
+commentReactions(reactions=activity.comment.reactions commentId=activity.comment._id) +commentReactions(reactions=activity.comment.reactions commentId=activity.comment._id)
span(title=activity.createdAt).activity-meta {{ moment activity.createdAt }} if($eq currentUser._id activity.comment.userId)
if($eq currentUser._id activity.comment.userId) +editOrDeleteComment
+editOrDeleteComment else if currentUser.isBoardAdmin
else if currentUser.isBoardAdmin +editOrDeleteComment
+editOrDeleteComment
if($eq activity.activityType 'deleteComment') if($eq activity.activityType 'deleteComment')
| {{{_ 'activity-deleteComment' activity.commentId}}}. | {{{_ 'activity-deleteComment' activity.commentId}}}.
@ -242,3 +240,5 @@ template(name="activity")
= ' @' = ' @'
else if(currentData.timeValue) else if(currentData.timeValue)
| {{_ activity.activityType currentData.timeValue}} | {{_ activity.activityType currentData.timeValue}}
div(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}