From 010aa4636ace30a9df4c09f0ca991169f34274b9 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Fri, 6 Jan 2023 10:54:02 +0530
Subject: [PATCH] fix: Dont throw back to `/` if desk page not found (#19494)

---
 frappe/public/js/frappe/desk.js    |  2 --
 frappe/public/js/frappe/request.js | 15 +++++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index a7c3d1c723..1e29e1a065 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -168,7 +168,6 @@ frappe.Application = class Application {
 	}
 
 	set_route() {
-		frappe.flags.setting_original_route = true;
 		if (frappe.boot && localStorage.getItem("session_last_route")) {
 			frappe.set_route(localStorage.getItem("session_last_route"));
 			localStorage.removeItem("session_last_route");
@@ -176,7 +175,6 @@ frappe.Application = class Application {
 			// route to home page
 			frappe.router.route();
 		}
-		frappe.after_ajax(() => (frappe.flags.setting_original_route = false));
 		frappe.router.on("change", () => {
 			$(".tooltip").hide();
 		});
diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index b4ed57dc87..dae436a84a 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -135,16 +135,11 @@ frappe.request.call = function (opts) {
 			}
 		},
 		404: function (xhr) {
-			if (frappe.flags.setting_original_route) {
-				// original route is wrong, redirect to login
-				frappe.app.redirect_to_login();
-			} else {
-				frappe.msgprint({
-					title: __("Not found"),
-					indicator: "red",
-					message: __("The resource you are looking for is not available"),
-				});
-			}
+			frappe.msgprint({
+				title: __("Not found"),
+				indicator: "red",
+				message: __("The resource you are looking for is not available"),
+			});
 		},
 		403: function (xhr) {
 			if (frappe.session.user === "Guest" && frappe.session.logged_in_user !== "Guest") {