diff options
author | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
---|---|---|
committer | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
commit | 9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874 (patch) | |
tree | 47ffe9a487aa6d66bbb4cd327ca248c4b30fda4a /models/activities.js | |
parent | c0c7b269a794fb28ddf5ffc17744f6724041de96 (diff) | |
parent | 8b16955cc27b29ae507be084adccc4fad61b05ef (diff) | |
download | wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2 wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip |
resolving merge conflicts
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'); |