summaryrefslogtreecommitdiffstats
path: root/models/activities.js
diff options
context:
space:
mode:
authorSam X. Chen <sam.xi.chen@gmail.com>2019-07-11 10:47:08 -0400
committerSam X. Chen <sam.xi.chen@gmail.com>2019-07-11 10:47:08 -0400
commitf2a0ae0a2c115a1cfdc3c6153ca80fd03df12ba7 (patch)
treeeffc415f39dd6a1d72c38c668fcba0cb9e0e4147 /models/activities.js
parent5ca09cdf096e02cfd8e6ecd61fc4cbb651703558 (diff)
parent46970ae424d33c3caec25acf2861407555713a30 (diff)
downloadwekan-f2a0ae0a2c115a1cfdc3c6153ca80fd03df12ba7.tar.gz
wekan-f2a0ae0a2c115a1cfdc3c6153ca80fd03df12ba7.tar.bz2
wekan-f2a0ae0a2c115a1cfdc3c6153ca80fd03df12ba7.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'models/activities.js')
-rw-r--r--models/activities.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/models/activities.js b/models/activities.js
index 3ad316a7..feda36e5 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -189,7 +189,9 @@ if (Meteor.isServer) {
if (activity.customFieldId) {
const customField = activity.customField();
params.customField = customField.name;
- params.customFieldValue = customField.text;
+ params.customFieldValue = Activities.findOne({
+ customFieldId: customField._id,
+ }).value;
}
// Label activity did not work yet, unable to edit labels when tried this.
//if (activity.labelId) {