mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-24 02:47:35 +01:00
Code Issues Releases Wiki Activity

Fixed #35913 -- Prevented formset name suffix 'FormFormSet'.

Browse Source
This commit is contained in:
antoliny0919 2024-11-17 11:25:44 +09:00 committed by Sarah Boyce
parent 4c452cc377
commit f60d5e46e1
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/forms/formsets.py
View File

@ -570,7 +570,12 @@ def formset_factory(
"validate_max": validate_max, "validate_max": validate_max,
"renderer": renderer, "renderer": renderer,
} }
return type(form.__name__ + "FormSet", (formset,), attrs) form_name = form.__name__
if form_name.endswith("Form"):
formset_name = form_name + "Set"
else:
formset_name = form_name + "FormSet"
return type(formset_name, (formset,), attrs)
def all_valid(formsets): def all_valid(formsets):

6
tests/forms_tests/tests/test_formsets.py
View File

@ -149,6 +149,12 @@ class FormsFormsetTestCase(SimpleTestCase):
self.assertFalse(formset.is_valid()) self.assertFalse(formset.is_valid())
self.assertFalse(formset.has_changed()) self.assertFalse(formset.has_changed())
def test_formset_name(self):
ArticleFormSet = formset_factory(ArticleForm)
ChoiceFormSet = formset_factory(Choice)
self.assertEqual(ArticleFormSet.__name__, "ArticleFormSet")
self.assertEqual(ChoiceFormSet.__name__, "ChoiceFormSet")
def test_form_kwargs_formset(self): def test_form_kwargs_formset(self):
""" """
Custom kwargs set on the formset instance are passed to the Custom kwargs set on the formset instance are passed to the