From c526cedd41fd129bd260fc8f3c8899fdf729dbd8 Mon Sep 17 00:00:00 2001 From: Tim Richardson Date: Sat, 12 Oct 2013 14:37:14 +1100 Subject: [PATCH] completed merge of virtual fields in fields arguemnt for SQLFORM.grid --- gluon/sqlhtml.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 101e9a23..3e2521c5 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1925,11 +1925,13 @@ class SQLFORM(FORM): columns = [] virtual_columns = [] for table in tables: - fields += filter(filter1, table) - columns += filter(filter2, table) for k,f in table.iteritems(): 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 #show virtual fields after real fields so put at end of list virtual_columns.append(f) #add to fields as well