Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-29 21:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'Akuket-edge' into edge

Browse source
This commit is contained in:
Lauri Ojansivu 2018-10-16 13:40:17 +03:00
commit 81f98e2da1
3 changed files with 8 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;
},

5
models/activities.js
View file

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

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