vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(redirect): make the status codes a select field instead of int

Browse source 
Drop mandatory, assume sane defaults
The current implementation broke old users of redirects like helpdesk app

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
Akhil Narang 2023-12-22 12:22:48 +05:30
parent 1d23888475
commit ff4dca3e16
No known key found for this signature in database
GPG key ID: 9DCC61E211BF645F
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/tests/test_website.py
View file

@ -180,7 +180,11 @@ class TestWebsite(FrappeTestCase):
website_settings = frappe.get_doc("Website Settings")
website_settings.append(
"route_redirects",
{"source": "/testsource", "target": "/testtarget", "redirect_http_status": 301},
{"source": "/testsource", "target": "/testtarget"},
)
website_settings.append(
"route_redirects",
{"source": "/testdoc307", "target": "/testtarget", "redirect_http_status": 307},
)
website_settings.save()
@ -208,6 +212,11 @@ class TestWebsite(FrappeTestCase):
self.assertEqual(response.status_code, 301)
self.assertEqual(response.headers.get("Location"), "/testtarget")
set_request(method="GET", path="/testdoc307")
response = get_response()
self.assertEqual(response.status_code, 307)
self.assertEqual(response.headers.get("Location"), "/testtarget")
set_request(method="GET", path="/courses/course?course=data")
response = get_response()
self.assertEqual(response.status_code, 301)

7
frappe/website/doctype/website_route_redirect/website_route_redirect.json
View file

@ -26,15 +26,14 @@
{
"default": "301",
"fieldname": "redirect_http_status",
"fieldtype": "Int",
"fieldtype": "Select",
"label": "Redirect HTTP Status",
"options": "301\n302\n307\n308",
"reqd": 1
"options": "301\n302\n307\n308"
}
],
"istable": 1,
"links": [],
"modified": "2023-12-13 12:09:50.726082",
"modified": "2023-12-22 12:21:28.436139",
"modified_by": "Administrator",
"module": "Website",
"name": "Website Route Redirect",

2
frappe/website/doctype/website_route_redirect/website_route_redirect.py
View file

@ -17,7 +17,7 @@ class WebsiteRouteRedirect(Document):
parent: DF.Data
parentfield: DF.Data
parenttype: DF.Data
redirect_http_status: DF.Int
redirect_http_status: DF.Literal["301", "302", "307", "308"]
source: DF.SmallText
target: DF.SmallText
# end: auto-generated types

2
frappe/website/path_resolver.py
View file

@ -135,7 +135,7 @@ def resolve_redirect(path, query_string=None):
if match:
redirect_to = re.sub(pattern, rule["target"], path_to_match)
frappe.flags.redirect_location = redirect_to
status_code = rule.get("redirect_http_status", 301)
status_code = rule.get("redirect_http_status") or 301
frappe.cache.hset(
"website_redirects", path_to_match, {"path": redirect_to, "status_code": status_code}
)