1 files changed, 9 insertions, 3 deletions
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 397f9e9b..211f84f2 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -28,10 +28,16 @@ BlazeComponent.extendComponent({
     });
   },
 
-  currentCardIsInThisList() {
+  currentCardIsInThisList(listId, swimlaneId) {
     const currentCard = Cards.findOne(Session.get('currentCard'));
-    const listId = this.currentData()._id;
-    return currentCard && currentCard.listId === listId; //TODO: AND IN THIS SWIMLANE
+    const currentBoardId = Session.get('currentBoard');
+    const board = Boards.findOne(currentBoardId);
+    if (board.view === 'board-view-lists')
+      return currentCard && currentCard.listId === listId;
+    else if (board.view === 'board-view-swimlanes')
+      return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
+    else
+      return false;
   },
 
   events() {