Merge pull request #2031 from leonelcamara/patch-22

Use export columns as is supposed instead of selectable ones
This commit is contained in:
mdipierro
2018-10-06 11:31:14 -07:00
committed by GitHub
+2 -2
View File
@@ -2693,13 +2693,13 @@ class SQLFORM(FORM):
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,
cacheable=True, *selectable_columns) cacheable=True, *expcolumns)
except Exception as e: except Exception as e:
response.flash = T('Internal Error') response.flash = T('Internal Error')
rows = [] rows = []
else: else:
rows = dbset.select(left=left, orderby=orderby, rows = dbset.select(left=left, orderby=orderby,
cacheable=True, *selectable_columns) cacheable=True, *expcolumns)
value = exportManager[export_type] value = exportManager[export_type]
clazz = value[0] if hasattr(value, '__getitem__') else value clazz = value[0] if hasattr(value, '__getitem__') else value