Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-05 08:01:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'edge' of https://github.com/Akuket/wekan into Akuket-edge

Browse source
This commit is contained in:
Lauri Ojansivu 2018-10-11 22:47:11 +03:00
commit b4402b72ac
7 changed files with 12 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

9
server/migrations.js
View file

@ -333,3 +333,12 @@ Migrations.add('add-authenticationMethod', () => {
},
}, noValidateMulti);
});
Migrations.add('remove-tag', () => {
Users.update({
}, {
$unset: {
'profile.tags':1,
},
}, noValidateMulti);
});

8
server/notifications/notifications.js
View file

@ -25,16 +25,12 @@ Notifications = {
participants.forEach((userId) => {
if (userMap[userId]) return;
const user = Users.findOne(userId);
if (user && user.hasTag('notify-participate')) {
userMap[userId] = user;
}
userMap[userId] = user;
});
watchers.forEach((userId) => {
if (userMap[userId]) return;
const user = Users.findOne(userId);
if (user && user.hasTag('notify-watch')) {
userMap[userId] = user;
}
userMap[userId] = user;
});
return _.map(userMap, (v) => v);
},