Commit 8f4540b2 authored by Joseph Kocherhans's avatar Joseph Kocherhans
Browse files

Fixed #12698. Model.clean() used with a ModelForm no longer causes a KeyError... 

Fixed #12698. Model.clean() used with a ModelForm no longer causes a KeyError when raising a ValidationError.
Note that previously it was possible to raise a ValidationError in the same place with a message_dict attribute. That behavior was a bug and will no longer have the same behavior.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 4682d693

django/forms/models.py

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ class BaseModelForm(BaseForm): 
        try:

            self.instance.clean()

        except ValidationError, e:

            self._update_errors(e.message_dict)

            self._update_errors({NON_FIELD_ERRORS: e.messages})

        super(BaseModelForm, self)._clean_form()



    def validate_unique(self):

tests/regressiontests/model_forms_regress/models.py

+10 −0
Original line number Diff line number Diff line 
import os

from django.db import models

from django.core.exceptions import ValidationError





class Person(models.Model):

    name = models.CharField(max_length=100)
@@ -37,3 +39,11 @@ class CustomFileField(models.FileField): 


class CustomFF(models.Model):

    f = CustomFileField(upload_to='unused', blank=True)



class RealPerson(models.Model):

    name = models.CharField(max_length=100)



    def clean(self):

        if self.name.lower() == 'anonymous':

            raise ValidationError("Please specify a real name.")

tests/regressiontests/model_forms_regress/tests.py

+16 −3
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ from django.forms.models import modelform_factory 
from django.conf import settings

from django.test import TestCase



from models import Person, Triple, FilePathModel, Article, Publication, CustomFF

from models import Person, RealPerson, Triple, FilePathModel, Article, Publication, CustomFF





class ModelMultipleChoiceFieldTests(TestCase):
@@ -134,3 +135,15 @@ class ModelChoiceIteratorTests(TestCase): 
            date_published=date(1991, 8, 22))

        f = Form()

        self.assertEqual(len(f.fields["publications"].choices), 1)



class RealPersonForm(forms.ModelForm):

    class Meta:

        model = RealPerson



class CustomModelFormSaveMethod(TestCase):

    def test_string_message(self):

        data = {'name': 'anonymous'}

        form = RealPersonForm(data)

        self.assertEqual(form.is_valid(), False)

        self.assertEqual(form.errors['__all__'], ['Please specify a real name.'])