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

fixed issue 1342:MySQL, self-reference, and null values

Browse Source
This commit is contained in:
mdipierro
2013-09-01 13:12:30 -05:00
parent b7f46c969f
commit ca85afeb2f
2 changed files with 4 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.6.0-development+timestamp.2013.09.01.12.42.52 Version 2.6.0-development+timestamp.2013.09.01.13.11.38
gluon/dal.py
+2
View File
@@ -6946,6 +6946,8 @@ def sqlhtml_validators(field):
multiple=True) multiple=True)
if field.unique: if field.unique:
requires._and = validators.IS_NOT_IN_DB(db,field) requires._and = validators.IS_NOT_IN_DB(db,field)
if not field.notnull:
requires = validators.IS_EMPTY_OR(requires)
return requires return requires
elif field_type.startswith('list:'): elif field_type.startswith('list:'):
def repr_list(values,row=None): return', '.join(str(v) for v in (values or [])) def repr_list(values,row=None): return', '.join(str(v) for v in (values or []))