summaryrefslogtreecommitdiffstats
path: root/models/activities.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-10-16 13:40:17 +0300
committerLauri Ojansivu <x@xet7.org>2018-10-16 13:40:17 +0300
commit81f98e2da1998d62e937f3c3094c9a8cc14f4ccd (patch)
treebc92da43c179b9bc88cd34b0c92c8938007a3517 /models/activities.js
parent3dcebe8a9eb6ef96fc8a6a42dc1a1ce7a2a4d98c (diff)
parent50edffee47edf94f4f3aa21e5030354a33acf3d6 (diff)
downloadwekan-81f98e2da1998d62e937f3c3094c9a8cc14f4ccd.tar.gz
wekan-81f98e2da1998d62e937f3c3094c9a8cc14f4ccd.tar.bz2
wekan-81f98e2da1998d62e937f3c3094c9a8cc14f4ccd.zip
Merge branch 'Akuket-edge' into edge
Diffstat (limited to 'models/activities.js')
-rw-r--r--models/activities.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/models/activities.js b/models/activities.js
index f3dabc6a..47e3ff1e 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -151,10 +151,11 @@ if (Meteor.isServer) {
}
if (board) {
const watchingUsers = _.pluck(_.where(board.watchers, {level: 'watching'}), 'userId');
- watchers = _.union(watchers, watchingUsers || []);
+ const trackingUsers = _.pluck(_.where(board.watchers, {level: 'tracking'}), 'userId');
+ watchers = _.union(watchers, watchingUsers, _.intersection(participants, trackingUsers));
}
- Notifications.getUsers(participants, watchers).forEach((user) => {
+ Notifications.getUsers(watchers).forEach((user) => {
Notifications.notify(user, title, description, params);
});