Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #8040 -- SlugField now returns a proper formfield to deal with …

…validation. Thanks Daniel Pope for the ticket and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5061970b76194d6a170d80ffab18260f138951c4 1 parent a64dc39
@brosner brosner authored
View
7 django/db/models/fields/__init__.py
@@ -890,6 +890,13 @@ def __init__(self, *args, **kwargs):
def get_internal_type(self):
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):
return [oldforms.SmallIntegerField]
View
3  docs/modelforms.txt
@@ -65,7 +65,8 @@ the full list of conversions:
(from ``django.contrib.localflavor.us``)
``PositiveIntegerField`` ``IntegerField``
``PositiveSmallIntegerField`` ``IntegerField``
- ``SlugField`` ``CharField``
+ ``SlugField`` ``RegexField`` accepting only letters,
+ numbers, underscores and hyphens
``SmallIntegerField`` ``IntegerField``
``TextField`` ``CharField`` with ``widget=Textarea``
``TimeField`` ``TimeField``
View
4 tests/modeltests/model_forms/models.py
@@ -301,11 +301,11 @@ def __unicode__(self):
[<Category: Entertainment>, <Category: It's a test>, <Category: Third test>]
If you call save() with invalid data, you'll get a ValueError.
->>> f = CategoryForm({'name': '', 'slug': '', 'url': 'foo'})
+>>> f = CategoryForm({'name': '', 'slug': 'not a slug!', 'url': 'foo'})
>>> f.errors['name']
[u'This field is required.']
>>> f.errors['slug']
-[u'This field is required.']
+[u"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."]
>>> f.cleaned_data
Traceback (most recent call last):
...
Please sign in to comment.
Something went wrong with that request. Please try again.