From 455d188da894a2d9b13c25c6a3378efb08647460 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 7 Apr 2019 16:26:28 -0700 Subject: [PATCH] removed un-necessary sort exception is sqlform.grid --- gluon/packages/dal | 2 +- gluon/sqlhtml.py | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gluon/packages/dal b/gluon/packages/dal index ce5105f9..39c8463f 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit ce5105f9ef4114dd3f6162bfe6ba7d650e592075 +Subproject commit 39c8463f959c42173f7bc5575652595bc6b22c02 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 5c1c59f6..19d333d9 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2665,11 +2665,7 @@ class SQLFORM(FORM): if order and not order == 'None': otablename, ofieldname = order.split('~')[-1].split('.', 1) sort_field = db[otablename][ofieldname] - exception = sort_field.type in ('date', 'datetime', 'time') - if exception: - orderby = (order[:1] == '~' and sort_field) or ~sort_field - else: - orderby = (order[:1] == '~' and ~sort_field) or sort_field + orderby = sort_field if order[:1] != '~' else ~sort_field orderby = fix_orderby(orderby) @@ -2803,12 +2799,7 @@ class SQLFORM(FORM): otablename, ofieldname = order.split('~')[-1].split('.', 1) sort_field = db[otablename][ofieldname] # invert order direction on date/time fields - exception = sort_field.type in ('date', 'datetime', 'time') - 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 + orderby = sort_field if order[:1] != '~' else ~sort_field headcols = [] if selectable: