diff options
author | windblow <cskim.ns@gmail.com> | 2019-04-06 12:45:31 +0300 |
---|---|---|
committer | windblow <cskim.ns@gmail.com> | 2019-04-06 12:45:31 +0300 |
commit | 143e93f483c947185d7db1380bad23005e3d946c (patch) | |
tree | bb46902f7c92d81ae2753d4d5a013eca90a54a58 | |
parent | b680bb53725103f186ac1c7cb604fbd4a5773051 (diff) | |
download | wekan-143e93f483c947185d7db1380bad23005e3d946c.tar.gz wekan-143e93f483c947185d7db1380bad23005e3d946c.tar.bz2 wekan-143e93f483c947185d7db1380bad23005e3d946c.zip |
Add variables for activity notifications Fixes #2285
-rw-r--r-- | models/attachments.js | 4 | ||||
-rw-r--r-- | models/cardComments.js | 2 | ||||
-rw-r--r-- | models/cards.js | 6 | ||||
-rw-r--r-- | models/checklistItems.js | 10 | ||||
-rw-r--r-- | models/checklists.js | 4 |
5 files changed, 26 insertions, 0 deletions
diff --git a/models/attachments.js b/models/attachments.js index f870861b..fb32f497 100644 --- a/models/attachments.js +++ b/models/attachments.js @@ -72,6 +72,8 @@ if (Meteor.isServer) { attachmentId: doc._id, boardId: doc.boardId, cardId: doc.cardId, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }); } else { // Don't add activity about adding the attachment as the activity @@ -96,6 +98,8 @@ if (Meteor.isServer) { activityType: 'deleteAttachment', boardId: doc.boardId, cardId: doc.cardId, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }); }); } diff --git a/models/cardComments.js b/models/cardComments.js index fcb97104..2bcb5453 100644 --- a/models/cardComments.js +++ b/models/cardComments.js @@ -87,6 +87,8 @@ function commentCreation(userId, doc){ boardId: doc.boardId, cardId: doc.cardId, commentId: doc._id, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }); } diff --git a/models/cards.js b/models/cards.js index 047a760e..e65d88ae 100644 --- a/models/cards.js +++ b/models/cards.js @@ -1355,6 +1355,7 @@ function cardState(userId, doc, fieldNames) { boardId: doc.boardId, listId: doc.listId, cardId: doc._id, + swimlaneId: doc.swimlaneId, }); } else { Activities.insert({ @@ -1364,6 +1365,7 @@ function cardState(userId, doc, fieldNames) { listName: Lists.findOne(doc.listId).title, listId: doc.listId, cardId: doc._id, + swimlaneId: doc.swimlaneId, }); } } @@ -1425,6 +1427,8 @@ function cardLabels(userId, doc, fieldNames, modifier) { activityType: 'addedLabel', boardId: doc.boardId, cardId: doc._id, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }; Activities.insert(act); } @@ -1441,6 +1445,8 @@ function cardLabels(userId, doc, fieldNames, modifier) { activityType: 'removedLabel', boardId: doc.boardId, cardId: doc._id, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }); } } diff --git a/models/checklistItems.js b/models/checklistItems.js index c46fe9bd..013fee04 100644 --- a/models/checklistItems.js +++ b/models/checklistItems.js @@ -95,6 +95,8 @@ function itemCreation(userId, doc) { checklistId: doc.checklistId, checklistItemId: doc._id, checklistItemName:doc.title, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }); } @@ -121,6 +123,8 @@ function publishCheckActivity(userId, doc){ checklistId: doc.checklistId, checklistItemId: doc._id, checklistItemName:doc.title, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }; Activities.insert(act); } @@ -138,6 +142,8 @@ function publishChekListCompleted(userId, doc){ boardId, checklistId: doc.checklistId, checklistName: checkList.title, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }; Activities.insert(act); } @@ -169,6 +175,8 @@ function publishChekListUncompleted(userId, doc){ boardId, checklistId: doc.checklistId, checklistName: checkList.title, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }; Activities.insert(act); } @@ -207,6 +215,8 @@ if (Meteor.isServer) { checklistId: doc.checklistId, checklistItemId: doc._id, checklistItemName:doc.title, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }); }); } diff --git a/models/checklists.js b/models/checklists.js index 9e763f1a..d5063faf 100644 --- a/models/checklists.js +++ b/models/checklists.js @@ -135,6 +135,8 @@ if (Meteor.isServer) { boardId: Cards.findOne(doc.cardId).boardId, checklistId: doc._id, checklistName:doc.title, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }); }); @@ -152,6 +154,8 @@ if (Meteor.isServer) { boardId: Cards.findOne(doc.cardId).boardId, checklistId: doc._id, checklistName:doc.title, + listId: doc.listId, + swimlaneId: doc.swimlaneId, }); |