Ticket #6281: slugfield-as-regexfield.patch

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

@@ -1006 +1006 @@
             kwargs['db_index'] = True
         super(SlugField, self).__init__(*args, **kwargs)
 
+    def formfield(self, **kwargs):
+        # max_length and error_message can be overridden
+        kwargs['max_length'] = kwargs.get('max_length', self.max_length)
+        kwargs['error_message'] = kwargs.get(
+            'error_message',
+            _(u'Please enter a value containing only letters, numbers, '
+              u'dashes, and underscores.')
+            )
+        defaults = {'regex': r'^[-\w]+$', # from django.core.validators.slug_re
+                    'form_class': forms.RegexField,
+                    }
+        # other defaults cannot be overridden
+        kwargs.update(defaults)
+        return super(SlugField, self).formfield(**kwargs)
+
     def get_internal_type(self):
         return "SlugField"
 

trunk/tests/modeltests/model_forms/models.py

@@ -253 +253 @@
 >>> Category.objects.order_by('name')
 [<Category: Entertainment>, <Category: It's a test>]
 
+Invalid slug format test.
+>>> f = CategoryForm({'name': u"It's a bad slug test", 'slug': u'bad slug, no biscuit', 'url': u'test'})
+>>> f.is_valid()
+False
+>>> 'slug' in f.errors
+True
+
 If you call save() with commit=False, then it will return an object that
 hasn't yet been saved to the database. In this case, it's up to you to call
 save() on the resulting model instance.