diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-09-01 23:01:34 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-09-01 23:01:34 +0300 |
| commit | e041f55254e7a2ac48c25cbc70f6977dd2447270 (patch) | |
| tree | e525719e1bb20fb16fa7cd142330a405fdb7197d /models/activities.js | |
| parent | 491a352792238abf58ba9d973b5009bff581f904 (diff) | |
| parent | ba9f4fa7b7e5654bcc93251a0b75e958e1015e7f (diff) | |
| download | wekan-e041f55254e7a2ac48c25cbc70f6977dd2447270.tar.gz wekan-e041f55254e7a2ac48c25cbc70f6977dd2447270.tar.bz2 wekan-e041f55254e7a2ac48c25cbc70f6977dd2447270.zip | |
Merge branch 'andresmanelli-devel' into devel
Add more than one Outgoing Webhook. Thanks to andresmanelli !
Diffstat (limited to 'models/activities.js')
| -rw-r--r-- | models/activities.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/models/activities.js b/models/activities.js index 208dd629..c732a940 100644 --- a/models/activities.js +++ b/models/activities.js @@ -140,9 +140,9 @@ if (Meteor.isServer) { Notifications.notify(user, title, description, params); }); - const integration = Integrations.findOne({ boardId: board._id, type: 'outgoing-webhooks', enabled: true }); - if (integration) { - Meteor.call('outgoingWebhooks', integration, description, params); + const integrations = Integrations.find({ boardId: board._id, type: 'outgoing-webhooks', enabled: true, activities: { '$in': [description, 'all'] } }).fetch(); + if (integrations.length > 0) { + Meteor.call('outgoingWebhooks', integrations, description, params); } }); } |