removed un-necessary sort exception is sqlform.grid
This commit is contained in:
1 parent
d13a003475
commit
455d188da8
2 files changed
+3
-12
No files matched your search
+1
-1
Submodule gluon/packages/dal updated: ce5105f9ef...39c8463f95.
+2
-11
@@ -2665,11 +2665,7 @@ class SQLFORM(FORM):
|
|||||||
if order and not order == 'None':
|
if order and not order == 'None':
|
||||||
otablename, ofieldname = order.split('~')[-1].split('.', 1)
|
otablename, ofieldname = order.split('~')[-1].split('.', 1)
|
||||||
sort_field = db[otablename][ofieldname]
|
sort_field = db[otablename][ofieldname]
|
||||||
exception = sort_field.type in ('date', 'datetime', 'time')
|
orderby = sort_field if order[:1] != '~' else ~sort_field
|
||||||
if exception:
|
|
||||||
orderby = (order[:1] == '~' and sort_field) or ~sort_field
|
|
||||||
else:
|
|
||||||
orderby = (order[:1] == '~' and ~sort_field) or sort_field
|
|
||||||
|
|
||||||
orderby = fix_orderby(orderby)
|
orderby = fix_orderby(orderby)
|
||||||
|
|
||||||
@@ -2803,12 +2799,7 @@ class SQLFORM(FORM):
|
|||||||
otablename, ofieldname = order.split('~')[-1].split('.', 1)
|
otablename, ofieldname = order.split('~')[-1].split('.', 1)
|
||||||
sort_field = db[otablename][ofieldname]
|
sort_field = db[otablename][ofieldname]
|
||||||
# invert order direction on date/time fields
|
# invert order direction on date/time fields
|
||||||
exception = sort_field.type in ('date', 'datetime', 'time')
|
orderby = sort_field if order[:1] != '~' else ~sort_field
|
||||||
if exception:
|
|
||||||
desc_icon, asc_icon = sorter_icons
|
|
||||||
orderby = (order[:1] == '~' and sort_field) or ~sort_field
|
|
||||||
else:
|
|
||||||
orderby = (order[:1] == '~' and ~sort_field) or sort_field
|
|
||||||
|
|
||||||
headcols = []
|
headcols = []
|
||||||
if selectable:
|
if selectable:
|
||||||
|
|||||||
Reference in new issue
Block a user