dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2340 from jvanbraekel/master

Browse Source 
Fix order keyword value in Grid column sort
This commit is contained in:
mdipierro
2020-09-20 09:59:00 -07:00
committed by GitHub
parent d51de88096 0ad67ad5c8
commit 30707c169e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+4 -4
View File
@@ -2667,7 +2667,7 @@ class SQLFORM(FORM):
if export_type: if export_type:
order = request.vars.order or '' order = request.vars.order or ''
if sortable: if sortable:
if order and not order == 'None': if order:
otablename, ofieldname = order.split('~')[-1].split('.', 1) otablename, ofieldname = order.split('~')[-1].split('.', 1)
sort_field = db[otablename][ofieldname] sort_field = db[otablename][ofieldname]
orderby = sort_field if order[:1] != '~' else ~sort_field orderby = sort_field if order[:1] != '~' else ~sort_field
@@ -2800,7 +2800,7 @@ class SQLFORM(FORM):
order = request.vars.order or '' order = request.vars.order or ''
asc_icon, desc_icon = sorter_icons asc_icon, desc_icon = sorter_icons
if sortable: if sortable:
if order and not order == 'None': if order:
otablename, ofieldname = order.split('~')[-1].split('.', 1) otablename, ofieldname = order.split('~')[-1].split('.', 1)
sort_field = db[otablename][ofieldname] sort_field = db[otablename][ofieldname]
orderby = sort_field if order[:1] != '~' else ~sort_field orderby = sort_field if order[:1] != '~' else ~sort_field
@@ -2820,14 +2820,14 @@ class SQLFORM(FORM):
if key == order.lstrip('~'): if key == order.lstrip('~'):
if inverted: if inverted:
if key == order: if key == order:
key, marker = 'None', asc_icon marker = asc_icon
else: else:
key, marker = order[1:], desc_icon key, marker = order[1:], desc_icon
else: else:
if key == order: if key == order:
key, marker = '~' + order, asc_icon key, marker = '~' + order, asc_icon
else: else:
key, marker = 'None', desc_icon marker = desc_icon
elif inverted and key == str(field): elif inverted and key == str(field):
key = '~' + key key = '~' + key
header = A(header, marker, _href=url(vars=dict( header = A(header, marker, _href=url(vars=dict(