Changeset 6935

Timestamp:

12/17/07 04:35:53 (9 months ago)

Author:

mtredinnick

Message:

Fixed #6212 -- Give models.NullBooleanField? the right default newforms field. Patch from SmileyChris?.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (4 diffs)

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

@@ -711 +711 @@
-    def __init__(self, verbose_name=None, name=None, upload_to='', **kwargs):
-        self.upload_to = upload_to
-        
+
-        Field.__init__(self, verbose_name, name, **kwargs)
-
@@ -907 +907 @@
-        return [oldforms.NullBooleanField]
-
+    def formfield(self, **kwargs):
+        defaults = {'form_class': forms.NullBooleanField}
+        defaults.update(kwargs)
+        return super(NullBooleanField, self).formfield(**defaults)
+
-class PhoneNumberField(IntegerField):
-    def get_manipulator_field_objs(self):
@@ -923 +928 @@
-    def get_manipulator_field_objs(self):
-        return [oldforms.PositiveIntegerField]
-
+
-    def formfield(self, **kwargs):
-        defaults = {'min_value': 0}
-        defaults.update(kwargs)
- 
+
-
-class PositiveSmallIntegerField(IntegerField):
@@ -936 +941 @@
-        defaults = {'min_value': 0}
-        defaults.update(kwargs)
- 
+
-
-class SlugField(CharField):