Browse Source

Merge branch 'fmonthel-devel' into devel

Lauri Ojansivu 8 years ago
parent
commit
816d2bd013
1 changed files with 10 additions and 7 deletions
  1. 10 7
      models/cards.js

+ 10 - 7
models/cards.js

@@ -340,13 +340,16 @@ if (Meteor.isServer) {
     // Say goodbye to the former member
     // Say goodbye to the former member
     if (modifier.$pull && modifier.$pull.members) {
     if (modifier.$pull && modifier.$pull.members) {
       memberId = modifier.$pull.members;
       memberId = modifier.$pull.members;
-      Activities.insert({
-        userId,
-        memberId,
-        activityType: 'unjoinMember',
-        boardId: doc.boardId,
-        cardId: doc._id,
-      });
+      // Check that the former member is member of the card
+      if (_.contains(doc.members, memberId)) {
+        Activities.insert({
+          userId,
+          memberId,
+          activityType: 'unjoinMember',
+          boardId: doc.boardId,
+          cardId: doc._id,
+        });
+      }
     }
     }
   });
   });