Fix: Exporting from a SQLFORM.grid with customized search queries

issues #2006
This commit is contained in:
Prasad Muley committed 2015-01-15 22:02:07 +05:30
1 parent 0cfbab6206
commit 5958704509
1 file changed
+4
+4
View File
@@ -2332,6 +2332,10 @@ 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])
#use custom_query using searchable
if callable(searchable):
dbset = dbset(searchable(sfields, keywords))
else:
dbset = dbset(SQLFORM.build_query( dbset = dbset(SQLFORM.build_query(
sfields, keywords)) sfields, keywords))
rows = dbset.select(left=left, orderby=orderby, rows = dbset.select(left=left, orderby=orderby,