Changeset 8477

Timestamp:

08/22/08 23:59:25 (3 months ago)

Author:

brosner

Message:

Fixed #8040 -- SlugField? now returns a proper formfield to deal with validation. Thanks Daniel Pope for the ticket and patch.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/docs/modelforms.txt (modified) (1 diff)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (1 diff)

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

@@ -891 +891 @@
-        return "SlugField"
-
+    def formfield(self, **kwargs):
+        defaults = {'form_class': forms.RegexField, 'regex': r'^[a-zA-Z0-9_-]+$',
+            'error_messages': {'invalid': _(u"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.")},
+        }
+        defaults.update(kwargs)
+        return super(SlugField, self).formfield(**defaults)
+
-class SmallIntegerField(IntegerField):
-    def get_manipulator_field_objs(self):

django/trunk/docs/modelforms.txt

@@ -66 +66 @@
-    ``PositiveIntegerField``         ``IntegerField``
-    ``PositiveSmallIntegerField``    ``IntegerField``
-
+
+
-    ``SmallIntegerField``            ``IntegerField``
-    ``TextField``                    ``CharField`` with ``widget=Textarea``

django/trunk/tests/modeltests/model_forms/models.py

@@ -302 +302 @@
-
-If you call save() with invalid data, you'll get a ValueError.
-
+not a slug!
->>> f.errors['name']
-[u'This field is required.']
->>> f.errors['slug']
-'This field is required.'
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
->>> f.cleaned_data
-Traceback (most recent call last):