From 71dd300ae300aac8e00b2c1bc79591bfe36c8f41 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Fri, 26 Feb 2021 12:59:42 +0530 Subject: [PATCH] fix: Raise PageDoesNotExistError instead of DoesNotExistError (#12485) - to avoid it getting mixed up with Document Not Found error --- frappe/exceptions.py | 3 +++ frappe/website/render.py | 2 +- frappe/website/router.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/exceptions.py b/frappe/exceptions.py index 82fbff7a90..ab65e6e006 100644 --- a/frappe/exceptions.py +++ b/frappe/exceptions.py @@ -33,6 +33,9 @@ class PermissionError(Exception): class DoesNotExistError(ValidationError): http_status_code = 404 +class PageDoesNotExistError(ValidationError): + http_status_code = 404 + class NameError(Exception): http_status_code = 409 diff --git a/frappe/website/render.py b/frappe/website/render.py index eb1d3d92a1..71382c18ff 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -47,7 +47,7 @@ def render(path=None, http_status_code=None): else: try: data = render_page_by_language(path) - except frappe.DoesNotExistError: + except frappe.PageDoesNotExistError: doctype, name = get_doctype_from_path(path) if doctype and name: path = "printview" diff --git a/frappe/website/router.py b/frappe/website/router.py index bd61fc1da3..df9398cdeb 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -47,7 +47,7 @@ def get_page_context(path): def make_page_context(path): context = resolve_route(path) if not context: - raise frappe.DoesNotExistError + raise frappe.PageDoesNotExistError context.doctype = context.ref_doctype @@ -440,4 +440,4 @@ def get_doctypes_with_web_view(): return frappe.cache().get_value('doctypes_with_web_view', _get) def get_start_folders(): - return frappe.local.flags.web_pages_folders or ('www', 'templates/pages') \ No newline at end of file + return frappe.local.flags.web_pages_folders or ('www', 'templates/pages')