summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorguillaume <guillaume.cassou@supinfo.com>2018-10-16 11:33:16 +0200
committerguillaume <guillaume.cassou@supinfo.com>2018-10-16 11:33:16 +0200
commit41330b15dccfdd45c08b2657833a0bcba9576243 (patch)
treee1e9548eeb6a4c2c6fc80ff94e556489ad9493c4 /server
parent5c588b24240fb2fc996828e8478ac24a490971d8 (diff)
downloadwekan-41330b15dccfdd45c08b2657833a0bcba9576243.tar.gz
wekan-41330b15dccfdd45c08b2657833a0bcba9576243.tar.bz2
wekan-41330b15dccfdd45c08b2657833a0bcba9576243.zip
update broke ability to mute notifications
Diffstat (limited to 'server')
-rw-r--r--server/migrations.js8
-rw-r--r--server/notifications/notifications.js15
2 files changed, 12 insertions, 11 deletions
diff --git a/server/migrations.js b/server/migrations.js
index a5d93a4c..36355bdc 100644
--- a/server/migrations.js
+++ b/server/migrations.js
@@ -341,4 +341,12 @@ Migrations.add('remove-tag', () => {
'profile.tags':1,
},
}, noValidateMulti);
+});
+
+Migrations.add('remove-customFields-references-broken', () => {
+ Cards.update(
+ {'customFields.$value': null},
+ {$pull: {customFields: {value: null}}},
+ noValidateMulti,
+ );
}); \ No newline at end of file
diff --git a/server/notifications/notifications.js b/server/notifications/notifications.js
index 72692ef8..fa8b2ee2 100644
--- a/server/notifications/notifications.js
+++ b/server/notifications/notifications.js
@@ -19,20 +19,13 @@ Notifications = {
delete notifyServices[serviceName];
},
- // filter recipients according to user settings for notification
- getUsers: (participants, watchers) => {
- const userMap = {};
- participants.forEach((userId) => {
- if (userMap[userId]) return;
- const user = Users.findOne(userId);
- userMap[userId] = user;
- });
+ getUsers: (watchers) => {
+ const users = [];
watchers.forEach((userId) => {
- if (userMap[userId]) return;
const user = Users.findOne(userId);
- userMap[userId] = user;
+ if (user) users.push(user);
});
- return _.map(userMap, (v) => v);
+ return users;
},
notify: (user, title, description, params) => {