From 46d2ede2e363ef4158595aa9c99cd0dc4693ae5a Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 5 Feb 2021 13:05:14 +0530 Subject: [PATCH] fix: Use hooks for handling /desk and /app routes No need for random if statements, use the framework! --- frappe/hooks.py | 5 +++++ frappe/website/render.py | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 97a8b70953..3e206f0ad3 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -58,6 +58,11 @@ website_route_rules = [ {"from_route": "/kb/", "to_route": "Help Article"}, {"from_route": "/newsletters", "to_route": "Newsletter"}, {"from_route": "/profile", "to_route": "me"}, + {"from_route": "/app/", "to_route": "app"}, +] + +website_redirects = [ + {"source": r"/desk(.*)", "target": r"/app\1"}, ] base_template = "templates/base.html" diff --git a/frappe/website/render.py b/frappe/website/render.py index 5c19a3eb25..af3b18b233 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -252,13 +252,6 @@ def resolve_path(path): if path != "index": path = resolve_from_map(path) - if path.startswith("app"): - path = "app" - - # to keep backward compatibility - if path.startswith("desk"): - path = "app" - return path def resolve_from_map(path):