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

solved some bugs in build_query, thanks Michele

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-02-04 09:50:11 -06:00
parent 8fbae09fdf
commit f2c8c1fd21
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2012-02-03 11:31:35) stable Version 1.99.4 (2012-02-04 09:49:34) stable
gluon/sqlhtml.py
+9 -1
View File
@@ -1297,6 +1297,8 @@ class SQLFORM(FORM):
@staticmethod @staticmethod
def build_query(fields,keywords): def build_query(fields,keywords):
from gluon import current
request = current.request
if isinstance(keywords,(tuple,list)): if isinstance(keywords,(tuple,list)):
keywords = keywords[0] keywords = keywords[0]
request.vars.keywords = keywords request.vars.keywords = keywords
@@ -1781,7 +1783,13 @@ class SQLFORM(FORM):
classtr = 'odd' classtr = 'odd'
numrec+=1 numrec+=1
id = row[field_id] id = row[field_id]
tr = TR(_class=classtr) if row_id:
rid = row_id
if callable(rid):
rid = rid(row)
tr = TR(_id=rid, _class='%s %s' % (classtr, 'with_id'))
else:
tr = TR(_class=classtr)
if selectable: if selectable:
tr.append(INPUT(_type="checkbox",_name="records",_value=id, tr.append(INPUT(_type="checkbox",_name="records",_value=id,
value=request.vars.records)) value=request.vars.records))