From bd2b8625fb838096dab8c613087544b0e910f283 Mon Sep 17 00:00:00 2001
From: Martin Filser <github-wekan@linux-email.de>
Date: Thu, 21 Oct 2021 09:25:46 +0200
Subject: [PATCH] Set popupCard to null in router.js if currentCard is set to
 null

---
 config/router.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/config/router.js b/config/router.js
index 372f17c7e..dec27ba21 100644
--- a/config/router.js
+++ b/config/router.js
@@ -12,6 +12,7 @@ FlowRouter.route('/', {
     Session.set('currentBoard', null);
     Session.set('currentList', null);
     Session.set('currentCard', null);
+    Session.set('popupCard', null);
 
     Filter.reset();
     Session.set('sortBy', '');
@@ -34,6 +35,7 @@ FlowRouter.route('/public', {
     Session.set('currentBoard', null);
     Session.set('currentList', null);
     Session.set('currentCard', null);
+    Session.set('popupCard', null);
 
     Filter.reset();
     Session.set('sortBy', '');
@@ -56,6 +58,7 @@ FlowRouter.route('/b/:id/:slug', {
     const previousBoard = Session.get('currentBoard');
     Session.set('currentBoard', currentBoard);
     Session.set('currentCard', null);
+    Session.set('popupCard', null);
 
     // If we close a card, we'll execute again this route action but we don't
     // want to excape every current actions (filters, etc.)
@@ -84,6 +87,7 @@ FlowRouter.route('/b/:boardId/:slug/:cardId', {
 
     Session.set('currentBoard', params.boardId);
     Session.set('currentCard', params.cardId);
+    Session.set('popupCard', null);
 
     Utils.manageCustomUI();
     Utils.manageMatomo();
@@ -212,6 +216,7 @@ FlowRouter.route('/import/:source', {
     Session.set('currentBoard', null);
     Session.set('currentList', null);
     Session.set('currentCard', null);
+    Session.set('popupCard', null);
     Session.set('importSource', params.source);
 
     Filter.reset();
@@ -232,6 +237,7 @@ FlowRouter.route('/setting', {
       Session.set('currentBoard', null);
       Session.set('currentList', null);
       Session.set('currentCard', null);
+      Session.set('popupCard', null);
 
       Filter.reset();
       Session.set('sortBy', '');
@@ -255,6 +261,7 @@ FlowRouter.route('/information', {
       Session.set('currentBoard', null);
       Session.set('currentList', null);
       Session.set('currentCard', null);
+      Session.set('popupCard', null);
 
       Filter.reset();
       Session.set('sortBy', '');
@@ -277,6 +284,7 @@ FlowRouter.route('/people', {
       Session.set('currentBoard', null);
       Session.set('currentList', null);
       Session.set('currentCard', null);
+      Session.set('popupCard', null);
 
       Filter.reset();
       Session.set('sortBy', '');
@@ -299,6 +307,7 @@ FlowRouter.route('/admin-reports', {
       Session.set('currentBoard', null);
       Session.set('currentList', null);
       Session.set('currentCard', null);
+      Session.set('popupCard', null);
 
       Filter.reset();
       Session.set('sortBy', '');