Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/login-query' into 'dev'

Browse Source 
Reset query arguments on login if ?next is not available

See merge request crafty-controller/crafty-4!750
This commit is contained in:
Iain Powrie 2024-05-09 20:01:28 +00:00
commit 4842d5c505
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -5,7 +5,7 @@
### New features ### New features
TBD TBD
### Bug fixes ### Bug fixes
TBD - Reset query arguments on login if `?next` is not available ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/750))
### Tweaks ### Tweaks
- Add link to go back to dashboard on error page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/743)) - Add link to go back to dashboard on error page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/743))
### Lang ### Lang

5
app/classes/web/public_handler.py
View File

@ -48,7 +48,10 @@ class PublicHandler(BaseHandler):
} }
if self.request.query: if self.request.query:
page_data["query"] = self.request.query_arguments.get("next")[0].decode() request_query = self.request.query_arguments.get("next")
if not request_query:
self.redirect("/login")
page_data["query"] = request_query[0].decode()
# sensible defaults # sensible defaults
template = "public/404.html" template = "public/404.html"

1
app/frontend/templates/public/login.html
View File

@ -171,7 +171,6 @@
//Create an object from the form data entries //Create an object from the form data entries
let formDataObject = Object.fromEntries(formData.entries()); let formDataObject = Object.fromEntries(formData.entries());
console.log(formDataObject)
let res = await fetch(`/login`, { let res = await fetch(`/login`, {
method: 'POST', method: 'POST',
headers: { headers: {