github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed remaining places that needed datasette.urls, closes #1025

Browse source
This commit is contained in:
Simon Willison 2020-10-19 22:21:19 -07:00
commit 091441a444
8 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/views/base.py
View file

@ -218,7 +218,7 @@ class DataView(BaseView):
elif kwargs.get("table"):
kwargs["table"] = urllib.parse.unquote_plus(kwargs["table"])
should_redirect = "/{}-{}".format(name, expected)
should_redirect = self.ds.urls.path("{}-{}".format(name, expected))
if kwargs.get("table"):
should_redirect += "/" + urllib.parse.quote_plus(kwargs["table"])
if kwargs.get("pk_path"):

8
datasette/views/special.py
View file

@ -64,7 +64,7 @@ class AuthTokenView(BaseView):
raise Forbidden("Root token has already been used")
if secrets.compare_digest(token, self.ds._root_token):
self.ds._root_token = None
response = Response.redirect("/")
response = Response.redirect(self.ds.urls.instance())
response.set_cookie(
"ds_actor", self.ds.sign({"a": {"id": "root"}}, "actor")
)
@ -81,7 +81,7 @@ class LogoutView(BaseView):
async def get(self, request):
if not request.actor:
return Response.redirect("/")
return Response.redirect(self.ds.urls.instance())
return await self.render(
["logout.html"],
request,
@ -89,7 +89,7 @@ class LogoutView(BaseView):
)
async def post(self, request):
response = Response.redirect("/")
response = Response.redirect(self.ds.urls.instance())
response.set_cookie("ds_actor", "", expires=0, max_age=0)
self.ds.add_message(request, "You are now logged out", self.ds.WARNING)
return response
@ -172,4 +172,4 @@ class MessagesDebugView(BaseView):
datasette.add_message(request, message, datasette.ERROR)
else:
datasette.add_message(request, message, getattr(datasette, message_type))
return Response.redirect("/")
return Response.redirect(self.ds.urls.instance())