diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-03-08 20:51:57 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-03-08 20:51:57 +0200 |
commit | c5e72d1a2b7326ba21e5e0f01b370d37e59c67f7 (patch) | |
tree | 6b410ef99dfdcddd55d0d98ad1de7da873531b71 /client/components | |
parent | 117c9e069ecc5e5fcf52838062b53781bdb59f27 (diff) | |
parent | 951a9f81d6d98fda465c7dc724e7554353788956 (diff) | |
download | wekan-c5e72d1a2b7326ba21e5e0f01b370d37e59c67f7.tar.gz wekan-c5e72d1a2b7326ba21e5e0f01b370d37e59c67f7.tar.bz2 wekan-c5e72d1a2b7326ba21e5e0f01b370d37e59c67f7.zip |
Merge branch 'edge' of github.com:wekan/wekan into edge
Diffstat (limited to 'client/components')
-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; }, |