fixed an issue with lack of validators in 'double' type

This commit is contained in:
mdipierro
2014-08-11 00:02:08 -05:00
parent 5e07ed79cc
commit 3f65b8bfc8
5 changed files with 8 additions and 19 deletions

View File

@@ -1 +1 @@
Version 2.10.0-trunk+timestamp.2014.08.10.12.45.17
Version 2.10.0-trunk+timestamp.2014.08.11.00.01.43

View File

@@ -10261,8 +10261,10 @@ class Field(Expression):
def formatter(self, value):
requires = self.requires
if value is None or not requires:
return value or self.map_none
if value is None:
return self.map_none
if not requires:
return value
if not isinstance(requires, (list, tuple)):
requires = [requires]
elif isinstance(requires, tuple):

View File

@@ -1863,6 +1863,7 @@ class INPUT(DIV):
t = self['_type'] = 'text'
t = t.lower()
value = self['value']
if self['_value'] is None or isinstance(self['_value'],cgi.FieldStorage):
_value = None
else:

View File

@@ -1140,12 +1140,12 @@ class SQLFORM(FORM):
default = field.default
if isinstance(default, CALLABLETYPES):
default = default()
cond = readonly or \
(not ignore_rw and not field.writable and field.readable)
if default is not None and not cond:
if default is not None and not cond:
default = field.formatter(default)
dspval = default
inpval = default
@@ -1599,7 +1599,6 @@ class SQLFORM(FORM):
fields[fieldname] = self.vars[fieldname]
if dbio:
print fields
for fieldname in fields:
if fieldname in self.extra_fields:
del fields[fieldname]

View File

@@ -1,13 +0,0 @@
import glob, os
delimiters = ('<%','%>')
filenames = glob.glob('views/*')+glob.glob('views/*/*')
for filename in filenames:
if not os.path.isdir(filename):
page = open(filename,'rb').read()
page = page.replace('{{',delimiters[0]+' ').replace('}}',' '+delimiters[1])
open(filename,'wb').write(page)
code = open('models/db.py','rb').read()
code = code + '\n\n# custom delimiters for ractive.js or angular.js\nresponse.delimiters = %s\n' % repr(delimiters)
open('models/db.py','wb').write(code)