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

Merge pull request #590 from prasadmuley/issue2006_export_customize_query_defined_in_searchable

Browse Source 
Fix: Exporting from a SQLFORM.grid with customized search queries
This commit is contained in:
mdipierro
2015-01-16 08:51:58 -06:00
parent b36c38cc88 5958704509
commit f840cdae5f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+6 -2
View File
@@ -2332,8 +2332,12 @@ class SQLFORM(FORM):
#fields but not virtual fields #fields but not virtual fields
sfields = reduce(lambda a, b: a + b, sfields = reduce(lambda a, b: a + b,
[[f for f in t if f.readable and not isinstance(f, Field.Virtual)] for t in tables]) [[f for f in t if f.readable and not isinstance(f, Field.Virtual)] for t in tables])
dbset = dbset(SQLFORM.build_query( #use custom_query using searchable
sfields, keywords)) if callable(searchable):
dbset = dbset(searchable(sfields, keywords))
else:
dbset = dbset(SQLFORM.build_query(
sfields, keywords))
rows = dbset.select(left=left, orderby=orderby, rows = dbset.select(left=left, orderby=orderby,
cacheable=True, *selectable_columns) cacheable=True, *selectable_columns)
except Exception, e: except Exception, e: