1
0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00

Fixed #22628 -- Took initial forms into account when combining FormSet.min_num and FormSet.extra.

Forwardport of 79f15ab1ef from stable/1.7.x
This commit is contained in:
Stephen Burrows
2014-05-15 20:12:32 -07:00
committed by Tim Graham
parent 4a98130735
commit d64f192df1
5 changed files with 13 additions and 12 deletions

View File

@@ -204,8 +204,7 @@ class GenericInlineAdminParametersTest(TestCase):
def testMinNumParam(self):
"""
With extra=3 and min_num=2, there should be six forms.
See #22628 - this will change when that's fixed.
With extra=3 and min_num=2, there should be five forms.
"""
class MinNumInline(GenericTabularInline):
model = Media
@@ -220,7 +219,7 @@ class GenericInlineAdminParametersTest(TestCase):
request.user = User(username='super', is_superuser=True)
response = modeladmin.changeform_view(request, object_id=str(e.pk))
formset = response.context_data['inline_admin_formsets'][0].formset
self.assertEqual(formset.total_form_count(), 6)
self.assertEqual(formset.total_form_count(), 5)
self.assertEqual(formset.initial_form_count(), 1)