diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-03-13 15:56:54 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-03-13 15:56:54 +0200 |
commit | b68a2e2b41dddf233cf93a5909d80c46d2d178f5 (patch) | |
tree | 2232acc83347013ee554eccdab69205ac90dd9ec /models/activities.js | |
parent | 33f09f0887c2abc40c6659a60bb30d6a5cd68a1c (diff) | |
parent | 299484f7b28b7bca134618a8c95102626c935b6d (diff) | |
download | wekan-b68a2e2b41dddf233cf93a5909d80c46d2d178f5.tar.gz wekan-b68a2e2b41dddf233cf93a5909d80c46d2d178f5.tar.bz2 wekan-b68a2e2b41dddf233cf93a5909d80c46d2d178f5.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'models/activities.js')
-rw-r--r-- | models/activities.js | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/models/activities.js b/models/activities.js index 84c45856..1e97895d 100644 --- a/models/activities.js +++ b/models/activities.js @@ -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(); |