From dedc1e708faadd45a56c6b33801102a2e1b7662c Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Wed, 22 May 2019 21:25:13 +0200
Subject: [PATCH] fix redirect after login

---
 src/public/javascripts/mobile.js               | 1 +
 src/public/javascripts/services/note_detail.js | 8 ++++----
 src/routes/login.js                            | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/public/javascripts/mobile.js b/src/public/javascripts/mobile.js
index 7ff4ad57a..7e33f7aeb 100644
--- a/src/public/javascripts/mobile.js
+++ b/src/public/javascripts/mobile.js
@@ -47,6 +47,7 @@ async function showTree() {
         minExpandLevel: 2, // root can't be collapsed
         click: (event, data) => {
             if (data.targetType !== 'expander' && data.node.isActive()) {
+                // this is important for single column mobile view, otherwise it's not possible to see again previously displayed note
                 $tree.fancytree('getTree').reactivate(true);
 
                 return false;
diff --git a/src/public/javascripts/services/note_detail.js b/src/public/javascripts/services/note_detail.js
index 95237387a..b7ee2ea0a 100644
--- a/src/public/javascripts/services/note_detail.js
+++ b/src/public/javascripts/services/note_detail.js
@@ -337,10 +337,10 @@ function fireDetailLoaded() {
 }
 
 messagingService.subscribeToSyncMessages(syncData => {
-    if (syncData.some(sync => sync.entityName === 'notes')) {
-        infoService.showMessage('Reloading note because of background changes');
-
-        refreshTabs(null, sync.entityId);
+    for (const sync of syncData) {
+        if (sync.entityName === 'notes') {
+            refreshTabs(null, sync.entityId);
+        }
     }
 });
 
diff --git a/src/routes/login.js b/src/routes/login.js
index a4bfe2950..415834d58 100644
--- a/src/routes/login.js
+++ b/src/routes/login.js
@@ -24,7 +24,7 @@ async function login(req, res) {
             }
 
             req.session.loggedIn = true;
-            res.redirect('..');
+            res.redirect('.');
         });
     }
     else {