Merge branch 'nztqa-conflict-resolution-458' into devel

Optimize for mobile web, show single list per page with navigate bar.
Thanks to floatinghotpot and nztqa ! Related #953

1 files changed, 5 insertions, 0 deletions

diff --git a/config/router.js b/config/router.js
index c86a92ac..1f80004a 100644
--- a/config/router.js
+++ b/config/router.js
@@ -8,6 +8,7 @@ FlowRouter.route('/', {
   triggersEnter: [AccountsTemplates.ensureSignedIn],
   action() {
     Session.set('currentBoard', null);
+    Session.set('currentList', null);
     Session.set('currentCard', null);
 
     Filter.reset();
@@ -88,6 +89,7 @@ FlowRouter.route('/import/:source', {
       Session.set('fromBoard', Session.get('currentBoard'));
     }
     Session.set('currentBoard', null);
+    Session.set('currentList', null);
     Session.set('currentCard', null);
     Session.set('importSource', params.source);
 
@@ -106,6 +108,7 @@ FlowRouter.route('/setting', {
     AccountsTemplates.ensureSignedIn,
     () => {
       Session.set('currentBoard', null);
+      Session.set('currentList', null);
       Session.set('currentCard', null);
 
       Filter.reset();
@@ -126,6 +129,7 @@ FlowRouter.route('/information', {
     AccountsTemplates.ensureSignedIn,
     () => {
       Session.set('currentBoard', null);
+      Session.set('currentList', null);
       Session.set('currentCard', null);
 
       Filter.reset();
@@ -146,6 +150,7 @@ FlowRouter.route('/people', {
     AccountsTemplates.ensureSignedIn,
     () => {
       Session.set('currentBoard', null);
+      Session.set('currentList', null);
       Session.set('currentCard', null);
 
       Filter.reset();