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

Fixed #12285. ModelForm raises a more informative error if it doesn't have a... 

Fixed #12285. ModelForm raises a more informative error if it doesn't have a model class defined. Thanks, tobias.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7aeb37d6

django/forms/models.py

+2 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ class BaseModelForm(BaseForm): 
                 empty_permitted=False, instance=None):

        opts = self._meta

        if instance is None:

            if opts.model is None:

                raise ValueError('ModelForm has no model class specified.')

            # if we didn't get an instance, instantiate a new one

            self.instance = opts.model()

            object_data = {}

tests/regressiontests/model_forms_regress/tests.py

+6 −1
Original line number Diff line number Diff line
@@ -147,3 +147,8 @@ class CustomModelFormSaveMethod(TestCase): 
        self.assertEqual(form.is_valid(), False)

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



class ModelClassTests(TestCase):

    def test_no_model_class(self):

        class NoModelModelForm(forms.ModelForm):

            pass

        self.assertRaises(ValueError, NoModelModelForm)