diff options
author | Angelo Gallarello <angelo.gallarell@gmail.com> | 2018-08-16 16:54:29 +0200 |
---|---|---|
committer | Angelo Gallarello <angelo.gallarell@gmail.com> | 2018-08-16 16:54:29 +0200 |
commit | 9c6d374b950e8c4bd0c1c905cf36c953581a3156 (patch) | |
tree | ff2667017f5a30931bbef6807dfbff08ac5b2513 /client/components/activities | |
parent | 99e7c659072943b80b08564465ee8cb5c90d3905 (diff) | |
download | wekan-9c6d374b950e8c4bd0c1c905cf36c953581a3156.tar.gz wekan-9c6d374b950e8c4bd0c1c905cf36c953581a3156.tar.bz2 wekan-9c6d374b950e8c4bd0c1c905cf36c953581a3156.zip |
Labels activities
Diffstat (limited to 'client/components/activities')
-rw-r--r-- | client/components/activities/activities.jade | 7 | ||||
-rw-r--r-- | client/components/activities/activities.js | 13 |
2 files changed, 20 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index d3e3d5ba..735de57b 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -89,6 +89,13 @@ template(name="boardActivities") if($eq activityType 'restoredCard') | {{{_ 'activity-sent' cardLink boardLabel}}}. + if($eq activityType 'addedLabel') + | {{{_ 'activity-added-label' lastLabel cardLink}}}. + + if($eq activityType 'removedLabel') + | {{{_ 'activity-removed-label' lastLabel cardLink}}}. + + if($eq activityType 'unjoinMember') if($eq user._id member._id) | {{{_ 'activity-unjoined' cardLink}}}. diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 95699961..93bbb469 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -58,6 +58,19 @@ BlazeComponent.extendComponent({ }, card.title)); }, + lastLabel(){ + const lastLabelId = this.currentData().labelId; + const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId); + console.log("LAST"); + console.log(lastLabel); + + if(lastLabel.name == undefined || lastLabel.name == ""){ + return lastLabel.color; + }else{ + return lastLabel.name; + } + }, + listLabel() { return this.currentData().list().title; }, |