diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-05-18 16:19:48 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-05-18 16:19:48 +0300 |
commit | 1984a6b1c80dbd8b4eff89aa92913f943bacc63b (patch) | |
tree | 5ab5ade69721a03896ba1bfa6e19879dffee59b7 /models/activities.js | |
parent | c0c7b269a794fb28ddf5ffc17744f6724041de96 (diff) | |
parent | 1d904adc610afa3106acc00886a0a848e26e1cb1 (diff) | |
download | wekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.tar.gz wekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.tar.bz2 wekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.zip |
Merge branch 'feuerball11-feature-custom-fields' into devel
Diffstat (limited to 'models/activities.js')
-rw-r--r-- | models/activities.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/models/activities.js b/models/activities.js index 3f1d28ae..f64b53f8 100644 --- a/models/activities.js +++ b/models/activities.js @@ -44,6 +44,9 @@ Activities.helpers({ checklistItem() { return ChecklistItems.findOne(this.checklistItemId); }, + customField() { + return CustomFields.findOne(this.customFieldId); + }, }); Activities.before.insert((userId, doc) => { @@ -60,6 +63,7 @@ if (Meteor.isServer) { Activities._collection._ensureIndex({ boardId: 1, createdAt: -1 }); Activities._collection._ensureIndex({ commentId: 1 }, { partialFilterExpression: { commentId: { $exists: true } } }); Activities._collection._ensureIndex({ attachmentId: 1 }, { partialFilterExpression: { attachmentId: { $exists: true } } }); + Activities._collection._ensureIndex({ customFieldId: 1 }, { partialFilterExpression: { customFieldId: { $exists: true } } }); }); Activities.after.insert((userId, doc) => { @@ -127,6 +131,10 @@ if (Meteor.isServer) { const checklistItem = activity.checklistItem(); params.checklistItem = checklistItem.title; } + if (activity.customFieldId) { + const customField = activity.customField(); + params.customField = customField.name; + } if (board) { const watchingUsers = _.pluck(_.where(board.watchers, {level: 'watching'}), 'userId'); const trackingUsers = _.pluck(_.where(board.watchers, {level: 'tracking'}), 'userId'); |