github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'devel' of github.com:wekan/wekan into devel

Browse source
This commit is contained in:
Lauri Ojansivu 2019-03-12 23:01:31 +02:00
commit 0ad7f080b7
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
models/activities.js
View file

@ -113,9 +113,11 @@ if (Meteor.isServer) {
}
if (activity.oldBoardId) {
const oldBoard = activity.oldBoard();
watchers = _.union(watchers, oldBoard.watchers || []);
params.oldBoard = oldBoard.title;
params.oldBoardId = activity.oldBoardId;
if (oldBoard) {
watchers = _.union(watchers, oldBoard.watchers || []);
params.oldBoard = oldBoard.title;
params.oldBoardId = activity.oldBoardId;
}
}
if (activity.memberId) {
participants = _.union(participants, [activity.memberId]);
@ -129,15 +131,19 @@ if (Meteor.isServer) {
}
if (activity.oldListId) {
const oldList = activity.oldList();
watchers = _.union(watchers, oldList.watchers || []);
params.oldList = oldList.title;
params.oldListId = activity.oldListId;
if (oldList) {
watchers = _.union(watchers, oldList.watchers || []);
params.oldList = oldList.title;
params.oldListId = activity.oldListId;
}
}
if (activity.oldSwimlaneId) {
const oldSwimlane = activity.oldSwimlane();
watchers = _.union(watchers, oldSwimlane.watchers || []);
params.oldSwimlane = oldSwimlane.title;
params.oldSwimlaneId = activity.oldSwimlaneId;
if (oldSwimlane) {
watchers = _.union(watchers, oldSwimlane.watchers || []);
params.oldSwimlane = oldSwimlane.title;
params.oldSwimlaneId = activity.oldSwimlaneId;
}
}
if (activity.cardId) {
const card = activity.card();