From 3c0dbeedd5dc2f8f697acbb23d1c69f6ce5f719a Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 11 Jan 2019 16:13:57 +0900 Subject: [PATCH] send android clients to select server before login --- src/scripts/site.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/scripts/site.js b/src/scripts/site.js index 5a41d3bdba..29131c466d 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -62,7 +62,8 @@ var Dashboard = { }, logout: function(logoutWithServer) { function onLogoutDone() { - Dashboard.navigate("login.html") + var loginPage; + AppInfo.isNativeApp ? (loginPage = "selectserver.html", window.ApiClient = null) : loginPage = "login.html", Dashboard.navigate(loginPage) }!1 === logoutWithServer ? onLogoutDone() : ConnectionManager.logout().then(onLogoutDone) }, getConfigurationPageUrl: function(name) { @@ -1033,7 +1034,7 @@ var Dashboard = { }, appRouter.showSelectServer = function() { AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html") }, appRouter.showWelcome = function() { - Dashboard.navigate("login.html") + AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html") }, appRouter.showSettings = function() { Dashboard.navigate("mypreferencesmenu.html") }, appRouter.showGuide = function() {