Changeset 6252

Timestamp:

09/14/07 21:37:07 (1 year ago)

Author:

russellm

Message:

Fixed #4415 -- Added formfield method to PositiveIntegerField?, so that those fields get validated correctly. Thanks, Oggie Rob.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/models.py (modified) (1 diff)

django/trunk/django/db/models/fields/__init__.py

@@ -913 +913 @@
-    def get_manipulator_field_objs(self):
-        return [oldforms.PositiveIntegerField]
+    
+    def formfield(self, **kwargs):
+        defaults = {'min_value': 0}
+        defaults.update(kwargs)
+        return super(PositiveIntegerField, self).formfield(**defaults) 
-
-class PositiveSmallIntegerField(IntegerField):
-    def get_manipulator_field_objs(self):
-        return [oldforms.PositiveSmallIntegerField]
+
+    def formfield(self, **kwargs):
+        defaults = {'min_value': 0}
+        defaults.update(kwargs)
+        return super(PositiveSmallIntegerField, self).formfield(**defaults) 
-
-class SlugField(CharField):

django/trunk/tests/regressiontests/forms/models.py

@@ +1 @@
+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
+
+"""}