rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Preserve URL hash when redirecting in grid "reset to defaults"

Browse source
This commit is contained in:
Lance Edgar 2023-08-30 23:51:18 -05:00
parent 625982d639
commit 62aa0c5965
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tailbone/templates/grids/buefy.mako
View file

@ -542,7 +542,16 @@
resetView() { resetView() {
this.loading = true this.loading = true
location.href = '?reset-to-default-filters=true'
// use current url proper, plus reset param
let url = '?reset-to-default-filters=true'
// add current hash, to preserve that in redirect
if (location.hash) {
url += '&hash=' + location.hash.slice(1)
}
location.href = url
}, },
addFilter(filter_key) { addFilter(filter_key) {

12
tailbone/views/master.py
View file

@ -329,7 +329,11 @@ class MasterView(View):
# If user just refreshed the page with a reset instruction, issue a # If user just refreshed the page with a reset instruction, issue a
# redirect in order to clear out the query string. # redirect in order to clear out the query string.
if self.request.GET.get('reset-to-default-filters') == 'true': if self.request.GET.get('reset-to-default-filters') == 'true':
return self.redirect(self.request.current_route_url(_query=None)) kw = {'_query': None}
hash_ = self.request.GET.get('hash')
if hash_:
kw['_anchor'] = hash_
return self.redirect(self.request.current_route_url(**kw))
# Stash some grid stats, for possible use when generating URLs. # Stash some grid stats, for possible use when generating URLs.
if grid.pageable and hasattr(grid, 'pager'): if grid.pageable and hasattr(grid, 'pager'):
@ -1126,7 +1130,11 @@ class MasterView(View):
# If user just refreshed the page with a reset instruction, issue a # If user just refreshed the page with a reset instruction, issue a
# redirect in order to clear out the query string. # redirect in order to clear out the query string.
if self.request.GET.get('reset-to-default-filters') == 'true': if self.request.GET.get('reset-to-default-filters') == 'true':
return self.redirect(self.request.current_route_url(_query=None)) kw = {'_query': None}
hash_ = self.request.GET.get('hash')
if hash_:
kw['_anchor'] = hash_
return self.redirect(self.request.current_route_url(**kw))
# return grid only, if partial page was requested # return grid only, if partial page was requested
if self.request.params.get('partial'): if self.request.params.get('partial'):