From 577f3c8897530c5cf054a6a420045f01c624f71f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 26 Jul 2019 14:27:14 +0530 Subject: [PATCH] fix: redirect for OAuth --- frappe/public/js/frappe/router.js | 4 ++++ frappe/utils/oauth.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index ceb060530d..ad170b295e 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -47,6 +47,10 @@ frappe.route = function() { if(route[0]) { const title_cased_route = frappe.utils.to_title_case(route[0]); + if (title_cased_route === 'Desktop') { + frappe.views.pageview.show(''); + } + if(route[1] && frappe.views[title_cased_route + "Factory"]) { // has a view generator, generate! if(!frappe.view_factory[title_cased_route]) { diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py index f5cf5d81e8..9c30a04e63 100644 --- a/frappe/utils/oauth.py +++ b/frappe/utils/oauth.py @@ -290,7 +290,7 @@ def redirect_post_login(desk_user): frappe.local.response["type"] = "redirect" # the #desktop is added to prevent a facebook redirect bug - frappe.local.response["location"] = "/desk#desktop" if desk_user else "/" + frappe.local.response["location"] = "/desk#desktop" if desk_user else "/me" def oauth_decoder(data): if isinstance(data, bytes):