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

completed merge of virtual fields in fields arguemnt for SQLFORM.grid

Browse Source
This commit is contained in:
Tim Richardson
2013-10-12 14:37:14 +11:00
parent 436bd7b39c
commit c526cedd41
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+5 -3
View File
@@ -1925,11 +1925,13 @@ class SQLFORM(FORM):
columns = [] columns = []
virtual_columns = [] virtual_columns = []
for table in tables: for table in tables:
fields += filter(filter1, table)
columns += filter(filter2, table)
for k,f in table.iteritems(): for k,f in table.iteritems():
if not k.startswith('_'): if not k.startswith('_'):
if isinstance(f,Field.Virtual) and f.readable: if isinstance(f,Field):
fields.append(f) #what gets selected
if f.readable:
columns.append(f) #what gets shown
elif isinstance(f,Field.Virtual) and f.readable:
f.tablename = table._tablename f.tablename = table._tablename
#show virtual fields after real fields so put at end of list #show virtual fields after real fields so put at end of list
virtual_columns.append(f) #add to fields as well virtual_columns.append(f) #add to fields as well