Index: django/db/models/fields/__init__.py =================================================================== --- django/db/models/fields/__init__.py (revision 4563) +++ django/db/models/fields/__init__.py (working copy) @@ -762,18 +762,15 @@ def get_manipulator_field_objs(self): return [oldforms.PositiveSmallIntegerField] -class SlugField(Field): +class SlugField(CharField): def __init__(self, *args, **kwargs): kwargs['maxlength'] = kwargs.get('maxlength', 50) 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 - Field.__init__(self, *args, **kwargs) + CharField.__init__(self, *args, **kwargs) - def get_manipulator_field_objs(self): - return [oldforms.TextField] - class SmallIntegerField(IntegerField): def get_manipulator_field_objs(self): return [oldforms.SmallIntegerField] Index: tests/modeltests/model_forms/models.py =================================================================== --- tests/modeltests/model_forms/models.py (revision 4563) +++ tests/modeltests/model_forms/models.py (working copy) @@ -25,6 +25,7 @@ from django.db import models class Category(models.Model): + slug = models.SlugField(maxlength=20) name = models.CharField(maxlength=20) url = models.CharField('The URL', maxlength=40) @@ -38,6 +39,7 @@ return self.name class Article(models.Model): + slug = models.SlugField() headline = models.CharField(maxlength=50) pub_date = models.DateField() created = models.DateField(editable=False) @@ -71,9 +73,11 @@ >>> CategoryForm = form_for_model(Category) >>> f = CategoryForm() >>> print f + >>> print f.as_ul() +
    • >>> print f['name'] @@ -81,25 +85,26 @@ >>> f = CategoryForm(auto_id=False) >>> print f.as_ul() +
  • Slug:
  • Name:
  • The URL:
    • ->>> f = CategoryForm({'name': 'Entertainment', 'url': 'entertainment'}) +>>> f = CategoryForm({'slug': 'entertainment', 'name': 'Entertainment', 'url': 'entertainment'}) >>> f.is_valid() True >>> f.clean_data -{'url': u'entertainment', 'name': u'Entertainment'} +{'url': u'entertainment', 'slug': u'entertainment', 'name': u'Entertainment'} >>> obj = f.save() >>> obj >>> Category.objects.all() [] ->>> f = CategoryForm({'name': "It's a test", 'url': 'test'}) +>>> f = CategoryForm({'slug': 'its-test', 'name': "It's a test", 'url': 'test'}) >>> f.is_valid() True >>> f.clean_data -{'url': u'test', 'name': u"It's a test"} +{'url': u'test', 'slug': u'its-test', 'name': u"It's a test"} >>> obj = f.save() >>> obj @@ -109,11 +114,11 @@ 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. ->>> f = CategoryForm({'name': 'Third test', 'url': 'third'}) +>>> f = CategoryForm({'slug': 'third-test', 'name': 'Third test', 'url': 'third'}) >>> f.is_valid() True >>> f.clean_data -{'url': u'third', 'name': u'Third test'} +{'url': u'third', 'slug': u'third-test', 'name': u'Third test'} >>> obj = f.save(commit=False) >>> obj @@ -124,9 +129,9 @@ [, , ] If you call save() with invalid data, you'll get a ValueError. ->>> f = CategoryForm({'name': '', 'url': 'foo'}) +>>> f = CategoryForm({'slug': '', 'name': '', 'url': 'foo'}) >>> f.errors -{'name': [u'This field is required.']} +{'slug': [u'This field is required.'], 'name': [u'This field is required.']} >>> f.clean_data Traceback (most recent call last): ... @@ -135,7 +140,7 @@ Traceback (most recent call last): ... ValueError: The Category could not be created because the data didn't validate. ->>> f = CategoryForm({'name': '', 'url': 'foo'}) +>>> f = CategoryForm({'slug': '', 'name': '', 'url': 'foo'}) >>> f.save() Traceback (most recent call last): ... @@ -152,6 +157,7 @@ >>> ArticleForm = form_for_model(Article) >>> f = ArticleForm(auto_id=False) >>> print f +Slug: Headline: Pub date: Writer:
    Use both first and last names. ->>> art = Article(headline='Test article', pub_date=datetime.date(1988, 1, 4), writer=w, article='Hello.') +>>> art = Article(slug='test-article', headline='Test article', pub_date=datetime.date(1988, 1, 4), writer=w, article='Hello.') >>> art.save() >>> art.id 1 >>> TestArticleForm = form_for_instance(art) >>> f = TestArticleForm(auto_id=False) >>> print f.as_ul() +
  • Slug:
  • Headline:
  • Pub date:
  • Writer: Hold down "Control", or "Command" on a Mac, to select more than one.
    • ->>> f = TestArticleForm({'headline': u'New headline', 'pub_date': u'1988-01-04', 'writer': u'1', 'article': 'Hello.'}) +>>> f = TestArticleForm({'slug': 'new-headline', 'headline': u'New headline', 'pub_date': u'1988-01-04', 'writer': u'1', 'article': 'Hello.'}) >>> f.is_valid() True >>> new_art = f.save() @@ -224,6 +231,7 @@ >>> TestArticleForm = form_for_instance(new_art) >>> f = TestArticleForm(auto_id=False) >>> print f.as_ul() +
  • Slug:
  • Headline:
  • Pub date:
  • Writer: Hold down "Control", or "Command" on a Mac, to select more than one.
    • ->>> f = TestArticleForm({'headline': u'New headline', 'pub_date': u'1988-01-04', +>>> f = TestArticleForm({'slug': u'new-headline', 'headline': u'New headline', 'pub_date': u'1988-01-04', ... 'writer': u'1', 'article': u'Hello.', 'categories': [u'1', u'2']}) >>> new_art = f.save() >>> new_art.id @@ -248,7 +256,7 @@ [, ] Now, submit form data with no categories. This deletes the existing categories. ->>> f = TestArticleForm({'headline': u'New headline', 'pub_date': u'1988-01-04', +>>> f = TestArticleForm({'slug': u'new-headline', 'headline': u'New headline', 'pub_date': u'1988-01-04', ... 'writer': u'1', 'article': u'Hello.'}) >>> new_art = f.save() >>> new_art.id @@ -259,7 +267,7 @@ Create a new article, with categories, via the form. >>> ArticleForm = form_for_model(Article) ->>> f = ArticleForm({'headline': u'The walrus was Paul', 'pub_date': u'1967-11-01', +>>> f = ArticleForm({'slug': u'new-headline', 'headline': u'The walrus was Paul', 'pub_date': u'1967-11-01', ... 'writer': u'1', 'article': u'Test.', 'categories': [u'1', u'2']}) >>> new_art = f.save() >>> new_art.id @@ -270,7 +278,7 @@ Create a new article, with no categories, via the form. >>> ArticleForm = form_for_model(Article) ->>> f = ArticleForm({'headline': u'The walrus was Paul', 'pub_date': u'1967-11-01', +>>> f = ArticleForm({'slug': u'walrus-was-paul', 'headline': u'The walrus was Paul', 'pub_date': u'1967-11-01', ... 'writer': u'1', 'article': u'Test.'}) >>> new_art = f.save() >>> new_art.id @@ -283,6 +291,7 @@ the Category model, we can use save_instance() to apply its changes to an existing Category instance. >>> class ShortCategory(Form): +... slug = CharField(max_length=5) ... name = CharField(max_length=5) ... url = CharField(max_length=3) >>> cat = Category.objects.get(name='Third test') @@ -290,7 +299,7 @@ >>> cat.id 3 ->>> sc = ShortCategory({'name': 'Third', 'url': '3rd'}) +>>> sc = ShortCategory({'slug': 'third', 'name': 'Third', 'url': '3rd'}) >>> save_instance(sc, cat) >>> Category.objects.get(id=3) @@ -302,6 +311,7 @@ >>> ArticleForm = form_for_model(Article) >>> f = ArticleForm(auto_id=False) >>> print f.as_ul() +
  • Slug:
  • Headline:
  • Pub date:
  • Writer:
  • Headline:
  • Pub date:
  • Writer: