From d311124be59df64278f3149d68e79ce45b8a6c64 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 18 Aug 2018 16:15:18 -0400 Subject: Fixed #29682 -- Fixed admin change form crash if a view-only model's form has an extra field. --- tests/admin_utils/tests.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests/admin_utils') diff --git a/tests/admin_utils/tests.py b/tests/admin_utils/tests.py index d2697ca87e..463ba9556d 100644 --- a/tests/admin_utils/tests.py +++ b/tests/admin_utils/tests.py @@ -286,6 +286,22 @@ class UtilsTests(SimpleTestCase): ("not Really the Model", MockModelAdmin.test_from_model) ) + def test_label_for_field_form_argument(self): + class ArticleForm(forms.ModelForm): + extra_form_field = forms.BooleanField() + + class Meta: + fields = '__all__' + model = Article + + self.assertEqual( + label_for_field('extra_form_field', Article, form=ArticleForm()), + 'Extra form field' + ) + msg = "Unable to lookup 'nonexistent' on Article or ArticleForm" + with self.assertRaisesMessage(AttributeError, msg): + label_for_field('nonexistent', Article, form=ArticleForm()), + def test_label_for_property(self): # NOTE: cannot use @property decorator, because of # AttributeError: 'property' object has no attribute 'short_description' -- cgit v1.3