Ticket #317: slug.patch

django/conf/admin_media/js/urlify.js

@@ -8 +8 @@
                   "with"];
     r = new RegExp('\\b(' + removelist.join('|') + ')\\b', 'gi');
     s = s.replace(r, '');
-    s = s.replace(/[^\w\s]/g, '');   // remove unneeded chars
+    s = s.replace(/[^\w\s-]/g, '');   // remove unneeded chars
     s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
-    s = s.replace(/\s+/g, '_');      // convert spaces to underscores
+    s = s.replace(/\s+/g, '-');      // convert spaces to underscores
     s = s.toLowerCase();             // convert to lowercase
     return s.substring(0, num_chars);// trim to first num_chars chars
-}
- No newline at end of file
+}

django/core/meta/fields.py

@@ -485 +485 @@
 class SlugField(Field):
     def __init__(self, *args, **kwargs):
         kwargs['maxlength'] = 50
-        kwargs.setdefault('validator_list', []).append(validators.isAlphaNumeric)
+        kwargs.setdefault('validator_list', []).append(validators.isSlug)
         # Set db_index=True unless it's been set manually.
         if not kwargs.has_key('db_index'):
             kwargs['db_index'] = True

django/core/validators.py

@@ -14 +14 @@
 _timere = r'(?:[01]?[0-9]|2[0-3]):[0-5][0-9](?::[0-5][0-9])?'
 alnum_re = re.compile(r'^\w+$')
 alnumurl_re = re.compile(r'^[\w/]+$')
+slug_re = re.compile(r'^[\w.-]+$')
 ansi_date_re = re.compile('^%s$' % _datere)
 ansi_time_re = re.compile('^%s$' % _timere)
 ansi_datetime_re = re.compile('^%s %s$' % (_datere, _timere))
@@ -58 +59 @@
     if not alnumurl_re.search(field_data):
         raise ValidationError, "This value must contain only letters, numbers, underscores and slashes."
 
+def isSlug(field_data, all_data):
+    if not slug_re.search(field_data):
+        raise ValidationError, "This value must contain only letters, numbers, underscores and dashes."
+
 def isLowerCase(field_data, all_data):
     if field_data.lower() != field_data:
         raise ValidationError, "Uppercase letters are not allowed here."