1 files changed, 9 insertions, 1 deletions
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index 4df42586..9b47531f 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -430,6 +430,7 @@ BlazeComponent.extendComponent({
     const boards = Boards.find({
       archived: false,
       'members.userId': Meteor.userId(),
+      _id: {$ne: Meteor.user().getTemplatesBoardId()},
     }, {
       sort: ['title'],
     });
@@ -589,6 +590,9 @@ BlazeComponent.extendComponent({
     const boards = Boards.find({
       archived: false,
       'members.userId': Meteor.userId(),
+      _id: {
+        $ne: Meteor.user().getTemplatesBoardId(),
+      },
     }, {
       sort: ['title'],
     });
@@ -596,8 +600,12 @@ BlazeComponent.extendComponent({
   },
 
   cards() {
+    const currentId = Session.get('currentCard');
     if (this.parentBoard) {
-      return this.parentBoard.cards();
+      return Cards.find({
+        boardId: this.parentBoard,
+        _id: {$ne: currentId},
+      });
     } else {
       return [];
     }