dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crud.select(fields=[..]), fields can now be string, issue 901

Browse Source
This commit is contained in:
mdipierro
2012-07-24 21:11:35 -05:00
parent 3b42bc3e60
commit d295a479c6
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-07-24 06:53:03) dev Version 2.00.0 (2012-07-24 21:11:30) dev
gluon/sqlhtml.py
+2 -1
View File
@@ -1241,7 +1241,8 @@ class SQLFORM(FORM):
### do not know why this happens, it should not ### do not know why this happens, it should not
(source_file, original_filename) = \ (source_file, original_filename) = \
(cStringIO.StringIO(f), 'file.txt') (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 # this line is for backward compatibility only
self.vars['%s_newfilename' % fieldname] = newfilename self.vars['%s_newfilename' % fieldname] = newfilename
fields[fieldname] = newfilename fields[fieldname] = newfilename
gluon/tools.py
+2
View File
@@ -3397,6 +3397,8 @@ class Crud(object):
query = table.id > 0 query = table.id > 0
if not fields: if not fields:
fields = [field for field in table if field.readable] 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, rows = self.db(query).select(*fields,**dict(orderby=orderby,
limitby=limitby)) limitby=limitby))
return rows return rows