summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-10-16 13:52:45 +0300
committerLauri Ojansivu <x@xet7.org>2018-10-16 13:52:45 +0300
commit849f15ceee8f40514fe75cbc0b8492394989b2b6 (patch)
treeef6d33a31ddab2dd5b12f477b4e739391a39c7c6 /models
parentf5125b76bcdaa7afda065035786c6bd9b1c04026 (diff)
downloadwekan-849f15ceee8f40514fe75cbc0b8492394989b2b6.tar.gz
wekan-849f15ceee8f40514fe75cbc0b8492394989b2b6.tar.bz2
wekan-849f15ceee8f40514fe75cbc0b8492394989b2b6.zip
- Fix: Update broke the ability to mute notifications;
- Automatically close the sidebar. Thanks to Akuket ! Closes #1952
Diffstat (limited to 'models')
-rw-r--r--models/activities.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/models/activities.js b/models/activities.js
index 577aab68..e49cbf0a 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -143,10 +143,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);
});