diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-03-08 20:48:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-08 20:48:49 +0200 |
commit | 951a9f81d6d98fda465c7dc724e7554353788956 (patch) | |
tree | ab07a4c14e97a6b0d307864dadbccb50346ce504 /client | |
parent | 6f30c33f1119d68ded83f891146b86906e969c7b (diff) | |
parent | 6d6bb8fc5745300dedef85d4500e0a5ee3f9017f (diff) | |
download | wekan-951a9f81d6d98fda465c7dc724e7554353788956.tar.gz wekan-951a9f81d6d98fda465c7dc724e7554353788956.tar.bz2 wekan-951a9f81d6d98fda465c7dc724e7554353788956.zip |
Merge pull request #2239 from bentiss/customFields-activities
Activities: register customFields changes in the activities
Diffstat (limited to 'client')
-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; }, |