fixed issue #1622. Thanks @kyleflanagan for reporting it
This commit is contained in:
+3
-3
@@ -1454,7 +1454,7 @@ class SQLFORM(FORM):
|
|||||||
(cStringIO.StringIO(f), 'file.txt')
|
(cStringIO.StringIO(f), 'file.txt')
|
||||||
else:
|
else:
|
||||||
# this should never happen, why does it happen?
|
# this should never happen, why does it happen?
|
||||||
print 'f=',repr(f)
|
#print 'f=',repr(f)
|
||||||
continue
|
continue
|
||||||
newfilename = field.store(source_file, original_filename,
|
newfilename = field.store(source_file, original_filename,
|
||||||
field.uploadfolder)
|
field.uploadfolder)
|
||||||
@@ -2182,8 +2182,8 @@ 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':
|
||||||
tablename, fieldname = order.split('~')[-1].split('.', 1)
|
otablename, ofieldname = order.split('~')[-1].split('.', 1)
|
||||||
sort_field = db[tablename][fieldname]
|
sort_field = db[otablename][ofieldname]
|
||||||
exception = sort_field.type in ('date', 'datetime', 'time')
|
exception = sort_field.type in ('date', 'datetime', 'time')
|
||||||
if exception:
|
if exception:
|
||||||
orderby = (order[:1] == '~' and sort_field) or ~sort_field
|
orderby = (order[:1] == '~' and sort_field) or ~sort_field
|
||||||
|
|||||||
Reference in New Issue
Block a user