crud.select(fields=[..]), fields can now be string, issue 901
This commit is contained in:
@@ -1 +1 @@
|
||||
Version 2.00.0 (2012-07-24 06:53:03) dev
|
||||
Version 2.00.0 (2012-07-24 21:11:30) dev
|
||||
|
||||
+2
-1
@@ -1241,7 +1241,8 @@ class SQLFORM(FORM):
|
||||
### do not know why this happens, it should not
|
||||
(source_file, original_filename) = \
|
||||
(cStringIO.StringIO(f), 'file.txt')
|
||||
newfilename = field.store(source_file, original_filename, field.uploadfolder)
|
||||
newfilename = field.store(source_file, original_filename,
|
||||
field.uploadfolder)
|
||||
# this line is for backward compatibility only
|
||||
self.vars['%s_newfilename' % fieldname] = newfilename
|
||||
fields[fieldname] = newfilename
|
||||
|
||||
@@ -3397,6 +3397,8 @@ class Crud(object):
|
||||
query = table.id > 0
|
||||
if not fields:
|
||||
fields = [field for field in table if field.readable]
|
||||
else:
|
||||
fields = [table[f] if isinstance(f,str) else f for f in fields]
|
||||
rows = self.db(query).select(*fields,**dict(orderby=orderby,
|
||||
limitby=limitby))
|
||||
return rows
|
||||
|
||||
Reference in New Issue
Block a user