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

allow multiple left joins in grid

Browse Source
This commit is contained in:
mdipierro
2013-01-30 09:29:49 -06:00
parent 45969c7628
commit 8740fea7c1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.01.29.16.27.18 Version 2.4.1-alpha.2+timestamp.2013.01.30.09.29.07
gluon/sqlhtml.py
+4 -1
View File
@@ -1867,7 +1867,10 @@ class SQLFORM(FORM):
dbset = db(query) dbset = db(query)
tablenames = db._adapter.tables(dbset.query) tablenames = db._adapter.tables(dbset.query)
if left is not None: if left is not None:
tablenames += db._adapter.tables(left) if not isinstance(left, (list, tuple)):
left = [left]
for join in left:
tablenames += db._adapter.tables(join)
tables = [db[tablename] for tablename in tablenames] tables = [db[tablename] for tablename in tablenames]
if not fields: if not fields:
fields = reduce(lambda a, b: a + b, fields = reduce(lambda a, b: a + b,