github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-23 13:37:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

update broke ability to mute notifications

Browse source
This commit is contained in:
guillaume 2018-10-16 11:33:16 +02:00
parent 5c588b2424
commit 41330b15dc
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/components/sidebar/sidebar.js
View file

@ -16,8 +16,7 @@ BlazeComponent.extendComponent({
},
onCreated() {
const initOpen = Utils.isMiniScreen() ? false : (!Session.get('currentCard'));
this._isOpen = new ReactiveVar(initOpen);
this._isOpen = new ReactiveVar(false);
this._view = new ReactiveVar(defaultView);
Sidebar = this;
},

4
models/activities.js
View file

@ -152,10 +152,10 @@ if (Meteor.isServer) {
if (board) {
const watchingUsers = _.pluck(_.where(board.watchers, {level: 'watching'}), 'userId');
const trackingUsers = _.pluck(_.where(board.watchers, {level: 'tracking'}), 'userId');
watchers = _.union(watchers, watchingUsers || []);
watchers = _.union(watchers, watchingUsers, _.intersection(participants, trackingUsers));
}
Notifications.getUsers(participants, watchers).forEach((user) => {
Notifications.getUsers(watchers).forEach((user) => {
Notifications.notify(user, title, description, params);
});

8
server/migrations.js
View file

@ -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,
);
});

15
server/notifications/notifications.js
View file

@ -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) => {