grid(groupy=...')
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-06-14 14:31:27) dev
|
Version 2.00.0 (2012-06-14 14:34:59) dev
|
||||||
|
|||||||
+5
-3
@@ -1455,6 +1455,7 @@ class SQLFORM(FORM):
|
|||||||
left=None,
|
left=None,
|
||||||
headers={},
|
headers={},
|
||||||
orderby=None,
|
orderby=None,
|
||||||
|
groupby=None,
|
||||||
searchable=True,
|
searchable=True,
|
||||||
sortable=True,
|
sortable=True,
|
||||||
paginate=20,
|
paginate=20,
|
||||||
@@ -1740,8 +1741,9 @@ class SQLFORM(FORM):
|
|||||||
if subquery:
|
if subquery:
|
||||||
dbset = dbset(subquery)
|
dbset = dbset(subquery)
|
||||||
try:
|
try:
|
||||||
if left:
|
if left or groupby:
|
||||||
nrows = dbset.select('count(*)',left=left).first()['count(*)']
|
c = 'count(*)'
|
||||||
|
nrows = dbset.select(c,left=left,groupby=groupby).first()[c]
|
||||||
else:
|
else:
|
||||||
nrows = dbset.count()
|
nrows = dbset.count()
|
||||||
except:
|
except:
|
||||||
@@ -1841,7 +1843,7 @@ class SQLFORM(FORM):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
table_fields = [f for f in fields if f._tablename in tablenames]
|
table_fields = [f for f in fields if f._tablename in tablenames]
|
||||||
rows = dbset.select(left=left,orderby=orderby,limitby=limitby,*table_fields)
|
rows = dbset.select(left=left,orderby=orderby,groupby=groupby,limitby=limitby,*table_fields)
|
||||||
except SyntaxError:
|
except SyntaxError:
|
||||||
rows = None
|
rows = None
|
||||||
error = T("Query Not Supported")
|
error = T("Query Not Supported")
|
||||||
|
|||||||
Reference in New Issue
Block a user