diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-03-11 20:26:23 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-03-11 20:26:23 +0200 |
commit | aee05a549f64cb70a838a4285d0a736d2a3ac819 (patch) | |
tree | b8951e4971942cd9df7e6b6f26d9da7af93bbd69 /client/components/activities | |
parent | 0155c7d8ce5591cab7c9cd4ace2be6cbd741f9a1 (diff) | |
parent | 7da2a8a15e2e33a321b21aa926fdcf493e2e0423 (diff) | |
download | wekan-aee05a549f64cb70a838a4285d0a736d2a3ac819.tar.gz wekan-aee05a549f64cb70a838a4285d0a736d2a3ac819.tar.bz2 wekan-aee05a549f64cb70a838a4285d0a736d2a3ac819.zip |
v2.44
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components/activities')
-rw-r--r-- | client/components/activities/activities.jade | 6 | ||||
-rw-r--r-- | client/components/activities/activities.js | 18 |
2 files changed, 24 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index bddc4dad..949400f6 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -114,6 +114,12 @@ template(name="boardActivities") if($eq activityType 'removedLabel') | {{{_ 'activity-removed-label' lastLabel cardLink}}}. + if($eq activityType 'setCustomField') + | {{{_ 'activity-set-customfield' lastCustomField lastCustomFieldValue cardLink}}}. + + if($eq activityType 'unsetCustomField') + | {{{_ 'activity-unset-customfield' lastCustomField 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 b3fe8f50..81995221 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -82,6 +82,24 @@ BlazeComponent.extendComponent({ } }, + lastCustomField(){ + const lastCustomField = CustomFields.findOne(this.currentData().customFieldId); + return lastCustomField.name; + }, + + lastCustomFieldValue(){ + const lastCustomField = CustomFields.findOne(this.currentData().customFieldId); + const value = this.currentData().value; + if (lastCustomField.settings.dropdownItems && lastCustomField.settings.dropdownItems.length > 0) { + const dropDownValue = _.find(lastCustomField.settings.dropdownItems, (item) => { + return item._id === value; + }); + if (dropDownValue) + return dropDownValue.name; + } + return value; + }, + listLabel() { return this.currentData().list().title; }, |