mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-07 19:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/model-validation] added validators param to FormField

Browse Source 
This is still not used anywhere

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@10899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Honza Král 2009-06-03 02:36:16 +00:00
parent 14f9493380
commit b963651223
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/forms/fields.py
View File

@ -24,6 +24,7 @@ except NameError:
from sets import Set as set from sets import Set as set
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core import validators
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import smart_unicode, smart_str from django.utils.encoding import smart_unicode, smart_str
@ -52,6 +53,7 @@ EMPTY_VALUES = (None, '')
class Field(object): class Field(object):
widget = TextInput # Default widget to use when rendering this type of Field. widget = TextInput # Default widget to use when rendering this type of Field.
hidden_widget = HiddenInput # Default widget to use when rendering this as "hidden". hidden_widget = HiddenInput # Default widget to use when rendering this as "hidden".
default_validators = [] # Default set of validators
default_error_messages = { default_error_messages = {
'required': _(u'This field is required.'), 'required': _(u'This field is required.'),
'invalid': _(u'Enter a valid value.'), 'invalid': _(u'Enter a valid value.'),
@ -61,7 +63,8 @@ class Field(object):
creation_counter = 0 creation_counter = 0
def __init__(self, required=True, widget=None, label=None, initial=None, def __init__(self, required=True, widget=None, label=None, initial=None,
help_text=None, error_messages=None, show_hidden_initial=False): help_text=None, error_messages=None, show_hidden_initial=False,
validators=[]):
# required -- Boolean that specifies whether the field is required. # required -- Boolean that specifies whether the field is required.
# True by default. # True by default.
# widget -- A Widget class, or instance of a Widget class, that should # widget -- A Widget class, or instance of a Widget class, that should
@ -77,6 +80,7 @@ class Field(object):
# help_text -- An optional string to use as "help text" for this Field. # help_text -- An optional string to use as "help text" for this Field.
# show_hidden_initial -- Boolean that specifies if it is needed to render a # show_hidden_initial -- Boolean that specifies if it is needed to render a
# hidden widget with initial value after widget. # hidden widget with initial value after widget.
# validators -- List of addtional validators to use
if label is not None: if label is not None:
label = smart_unicode(label) label = smart_unicode(label)
self.required, self.label, self.initial = required, label, initial self.required, self.label, self.initial = required, label, initial
@ -109,6 +113,7 @@ class Field(object):
set_class_error_messages(messages, self.__class__) set_class_error_messages(messages, self.__class__)
messages.update(error_messages or {}) messages.update(error_messages or {})
self.error_messages = messages self.error_messages = messages
self.validators = self.default_validators + validators
def clean(self, value): def clean(self, value):
""" """
@ -164,6 +169,7 @@ class CharField(Field):
return {'maxlength': str(self.max_length)} return {'maxlength': str(self.max_length)}
class IntegerField(Field): class IntegerField(Field):
default_validators = [validators.validate_integer]
default_error_messages = { default_error_messages = {
'invalid': _(u'Enter a whole number.'), 'invalid': _(u'Enter a whole number.'),
'max_value': _(u'Ensure this value is less than or equal to %s.'), 'max_value': _(u'Ensure this value is less than or equal to %s.'),