Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-19 17:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2253 from justinr1234/devel

Browse source 
Fix watchers undefined #2252
This commit is contained in:
Lauri Ojansivu 2019-03-12 22:57:38 +02:00 • committed by GitHub
commit 1158cd42cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/activities.js
View file

@ -113,10 +113,12 @@ if (Meteor.isServer) {
} }
if (activity.oldBoardId) { if (activity.oldBoardId) {
const oldBoard = activity.oldBoard(); const oldBoard = activity.oldBoard();
if (oldBoard) {
watchers = _.union(watchers, oldBoard.watchers || []); watchers = _.union(watchers, oldBoard.watchers || []);
params.oldBoard = oldBoard.title; params.oldBoard = oldBoard.title;
params.oldBoardId = activity.oldBoardId; params.oldBoardId = activity.oldBoardId;
} }
}
if (activity.memberId) { if (activity.memberId) {
participants = _.union(participants, [activity.memberId]); participants = _.union(participants, [activity.memberId]);
params.member = activity.member().getName(); params.member = activity.member().getName();
@ -129,16 +131,20 @@ if (Meteor.isServer) {
} }
if (activity.oldListId) { if (activity.oldListId) {
const oldList = activity.oldList(); const oldList = activity.oldList();
if (oldList) {
watchers = _.union(watchers, oldList.watchers || []); watchers = _.union(watchers, oldList.watchers || []);
params.oldList = oldList.title; params.oldList = oldList.title;
params.oldListId = activity.oldListId; params.oldListId = activity.oldListId;
} }
}
if (activity.oldSwimlaneId) { if (activity.oldSwimlaneId) {
const oldSwimlane = activity.oldSwimlane(); const oldSwimlane = activity.oldSwimlane();
if (oldSwimlane) {
watchers = _.union(watchers, oldSwimlane.watchers || []); watchers = _.union(watchers, oldSwimlane.watchers || []);
params.oldSwimlane = oldSwimlane.title; params.oldSwimlane = oldSwimlane.title;
params.oldSwimlaneId = activity.oldSwimlaneId; params.oldSwimlaneId = activity.oldSwimlaneId;
} }
}
if (activity.cardId) { if (activity.cardId) {
const card = activity.card(); const card = activity.card();
participants = _.union(participants, [card.userId], card.members || []); participants = _.union(participants, [card.userId], card.members || []);