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

Merge pull request #1294 from leonelcamara/fix_1274

Browse Source 
fixes #1274
This commit is contained in:
mdipierro
2016-04-13 22:16:46 -05:00
parent 216ce5507c 59cbe99347
commit 894ff3c140
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal.py
+5 -5
View File
@@ -74,12 +74,12 @@ def _default_validators(db, field):
return requires return requires
# does not get here for reference and list:reference # does not get here for reference and list:reference
if field.unique: if field.unique:
requires.insert(0,validators.IS_NOT_IN_DB(db, field)) requires.insert(0, validators.IS_NOT_IN_DB(db, field))
excluded_fields = ['string','upload','text','password','boolean'] excluded_fields = ['string', 'upload', 'text', 'password', 'boolean']
if (field.notnull or field.unique) and not field_type in excluded_fields: if (field.notnull or field.unique) and not field_type in excluded_fields:
requires.insert(0,validators.IS_NOT_EMPTY()) requires.insert(0, validators.IS_NOT_EMPTY())
elif not field.notnull and not field.unique and requires: elif not field.notnull and not field.unique and requires:
requires[0] = validators.IS_EMPTY_OR(requires[0]) requires[0] = validators.IS_EMPTY_OR(requires[0], null='' if field in ('string', 'text', 'password') else None)
return requires return requires
from gluon.serializers import custom_json, xml from gluon.serializers import custom_json, xml
@@ -93,7 +93,7 @@ DAL.uuid = lambda x: web2py_uuid()
DAL.representers = { DAL.representers = {
'rows_render': sqlhtml.represent, 'rows_render': sqlhtml.represent,
'rows_xml': sqlhtml.SQLTABLE 'rows_xml': sqlhtml.SQLTABLE
} }
DAL.Field = Field DAL.Field = Field
DAL.Table = Table DAL.Table = Table