Merge pull request #2320 from rinnaz/fix/issue-2285

Add variables for activity notifications Fixes #2285

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 6de95123..7430ae52 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1356,6 +1356,7 @@ function cardState(userId, doc, fieldNames) {
         boardId: doc.boardId,
         listId: doc.listId,
         cardId: doc._id,
+        swimlaneId: doc.swimlaneId,
       });
     } else {
       Activities.insert({
@@ -1365,6 +1366,7 @@ function cardState(userId, doc, fieldNames) {
         listName: Lists.findOne(doc.listId).title,
         listId: doc.listId,
         cardId: doc._id,
+        swimlaneId: doc.swimlaneId,
       });
     }
   }
@@ -1426,6 +1428,8 @@ function cardLabels(userId, doc, fieldNames, modifier) {
         activityType: 'addedLabel',
         boardId: doc.boardId,
         cardId: doc._id,
+        listId: doc.listId,
+        swimlaneId: doc.swimlaneId,
       };
       Activities.insert(act);
     }
@@ -1442,6 +1446,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,
     });