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

partial fix for issue 1531, disable validation in crud search

Browse Source
This commit is contained in:
mdipierro
2013-06-18 07:23:01 -05:00
parent f01f74ed61
commit 7e245e3fbe
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.5.1-stable+timestamp.2013.06.18.06.29.26 Version 2.5.1-stable+timestamp.2013.06.18.07.22.19
gluon/tools.py
+4 -1
View File
@@ -3906,6 +3906,7 @@ class Crud(object):
""" """
table = tables[0] table = tables[0]
fields = args.get('fields', table.fields) fields = args.get('fields', table.fields)
validate = args.get('validate',True)
request = current.request request = current.request
db = self.db db = self.db
if not (isinstance(table, db.Table) or table in db.tables): if not (isinstance(table, db.Table) or table in db.tables):
@@ -3960,13 +3961,15 @@ class Crud(object):
if field.type[0:10] == 'reference ': if field.type[0:10] == 'reference ':
refsearch.append(self.get_query(field, refsearch.append(self.get_query(field,
opval, txtval, refsearch=True)) opval, txtval, refsearch=True))
else: elif validate:
value, error = field.validate(txtval) value, error = field.validate(txtval)
if not error: if not error:
### TODO deal with 'starts with', 'ends with', 'contains' on GAE ### TODO deal with 'starts with', 'ends with', 'contains' on GAE
query &= self.get_query(field, opval, value) query &= self.get_query(field, opval, value)
else: else:
row[3].append(DIV(error, _class='error')) row[3].append(DIV(error, _class='error'))
else:
query &= self.get_query(field, opval, txtval)
selected.append(field) selected.append(field)
form = FORM(tbl, INPUT(_type="submit")) form = FORM(tbl, INPUT(_type="submit"))
if selected: if selected: