summaryrefslogtreecommitdiffstats
path: root/client/components/activities/activities.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-05-18 16:19:48 +0300
committerLauri Ojansivu <x@xet7.org>2018-05-18 16:19:48 +0300
commit1984a6b1c80dbd8b4eff89aa92913f943bacc63b (patch)
tree5ab5ade69721a03896ba1bfa6e19879dffee59b7 /client/components/activities/activities.js
parentc0c7b269a794fb28ddf5ffc17744f6724041de96 (diff)
parent1d904adc610afa3106acc00886a0a848e26e1cb1 (diff)
downloadwekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.tar.gz
wekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.tar.bz2
wekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.zip
Merge branch 'feuerball11-feature-custom-fields' into devel
Diffstat (limited to 'client/components/activities/activities.js')
-rw-r--r--client/components/activities/activities.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index ccb064f3..95699961 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -91,6 +91,11 @@ BlazeComponent.extendComponent({
}, attachment.name()));
},
+ customField() {
+ const customField = this.currentData().customField();
+ return customField.name;
+ },
+
events() {
return [{
// XXX We should use Popup.afterConfirmation here