This commit is contained in:
Massimo Di Pierro
2011-12-04 15:40:05 -06:00
parent 4a3be2aea4
commit 0b6997aaad
2 changed files with 7 additions and 9 deletions
+1 -1
View File
@@ -1 +1 @@
Version 1.99.3 (2011-12-04 15:26:39) dev Version 1.99.3 (2011-12-04 15:40:01) dev
+6 -8
View File
@@ -1672,15 +1672,13 @@ class SQLFORM(FORM):
order = request.vars.order or '' order = request.vars.order or ''
if sortable: if sortable:
if order and not order=='None': if order and not order=='None':
if order[:1]=='~': tablename,fieldname = order.split('~')[-1].split('.',1)
sign, rorder = '~', order[1:] sort_field = db[tablename][fieldname]
exception = sort_field.type in ('date','datetime','time')
if exception:
orderby = (order[:1]=='~' and sort_field) or ~sort_field
else: else:
sign, rorder = '', order orderby = (order[:1]=='~' and ~sort_field) or sort_field
tablename,fieldname = rorder.split('.',1)
if sign=='~':
orderby=~db[tablename][fieldname]
else:
orderby=db[tablename][fieldname]
head = TR(_class=ui.get('header','')) head = TR(_class=ui.get('header',''))
if selectable: if selectable: