Fixed #4415 -- Added formfield method to PositiveIntegerField, so that those fields get validated correctly. Thanks, Oggie Rob.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
ce53de47a2
commit
cf3c94b26d
|
@ -913,10 +913,20 @@ class PositiveIntegerField(IntegerField):
|
||||||
def get_manipulator_field_objs(self):
|
def get_manipulator_field_objs(self):
|
||||||
return [oldforms.PositiveIntegerField]
|
return [oldforms.PositiveIntegerField]
|
||||||
|
|
||||||
|
def formfield(self, **kwargs):
|
||||||
|
defaults = {'min_value': 0}
|
||||||
|
defaults.update(kwargs)
|
||||||
|
return super(PositiveIntegerField, self).formfield(**defaults)
|
||||||
|
|
||||||
class PositiveSmallIntegerField(IntegerField):
|
class PositiveSmallIntegerField(IntegerField):
|
||||||
def get_manipulator_field_objs(self):
|
def get_manipulator_field_objs(self):
|
||||||
return [oldforms.PositiveSmallIntegerField]
|
return [oldforms.PositiveSmallIntegerField]
|
||||||
|
|
||||||
|
def formfield(self, **kwargs):
|
||||||
|
defaults = {'min_value': 0}
|
||||||
|
defaults.update(kwargs)
|
||||||
|
return super(PositiveSmallIntegerField, self).formfield(**defaults)
|
||||||
|
|
||||||
class SlugField(CharField):
|
class SlugField(CharField):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
kwargs['max_length'] = kwargs.get('max_length', 50)
|
kwargs['max_length'] = kwargs.get('max_length', 50)
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class BoundaryModel(models.Model):
|
||||||
|
positive_integer = models.PositiveIntegerField(null=True, blank=True)
|
||||||
|
|
||||||
|
__test__ = {'API_TESTS': """
|
||||||
|
>>> from django.newforms import form_for_model
|
||||||
|
|
||||||
|
# Boundary conditions on a PostitiveIntegerField #########################
|
||||||
|
>>> BoundaryForm = form_for_model(BoundaryModel)
|
||||||
|
>>> f = BoundaryForm({'positive_integer':100})
|
||||||
|
>>> f.is_valid()
|
||||||
|
True
|
||||||
|
>>> f = BoundaryForm({'positive_integer':0})
|
||||||
|
>>> f.is_valid()
|
||||||
|
True
|
||||||
|
>>> f = BoundaryForm({'positive_integer':-100})
|
||||||
|
>>> f.is_valid()
|
||||||
|
False
|
||||||
|
|
||||||
|
"""}
|
Loading…
Reference in New Issue