Ticket #17642: 17642.patch

django/contrib/admin/options.py

@@ -1356 +1356 @@
     formset = BaseInlineFormSet
     extra = 3
     max_num = None
+    min_num = None
     template = None
     verbose_name = None
     verbose_name_plural = None
@@ -1409 +1410 @@
             "formfield_callback": partial(self.formfield_for_dbfield, request=request),
             "extra": self.extra,
             "max_num": self.max_num,
+            "min_num": self.min_num,
             "can_delete": can_delete,
         }
         defaults.update(kwargs)

django/contrib/contenttypes/generic.py

@@ -424 +424 @@
                                   ct_field="content_type", fk_field="object_id",
                                   fields=None, exclude=None,
                                   extra=3, can_order=False, can_delete=True,
-                                  max_num=None,
+                                  max_num=None, min_num=None,
                                   formfield_callback=None):
     """
     Returns an ``GenericInlineFormSet`` for the given kwargs.
@@ -449 +449 @@
                                    formfield_callback=formfield_callback,
                                    formset=formset,
                                    extra=extra, can_delete=can_delete, can_order=can_order,
-                                   fields=fields, exclude=exclude, max_num=max_num)
+                                   fields=fields, exclude=exclude, max_num=max_num, min_num=min_num)
     FormSet.ct_field = ct_field
     FormSet.ct_fk_field = fk_field
     return FormSet
@@ -486 +486 @@
             "can_order": False,
             "fields": fields,
             "max_num": self.max_num,
+            "min_num": self.min_num,
             "exclude": exclude
         }
         defaults.update(kwargs)

django/forms/models.py

@@ -664 +664 @@
 def modelformset_factory(model, form=ModelForm, formfield_callback=None,
                          formset=BaseModelFormSet,
                          extra=1, can_delete=False, can_order=False,
-                         max_num=None, fields=None, exclude=None):
+                         max_num=None, min_num=None, fields=None, exclude=None):
     """
     Returns a FormSet class for the given Django model class.
     """
     form = modelform_factory(model, form=form, fields=fields, exclude=exclude,
                              formfield_callback=formfield_callback)
-    FormSet = formset_factory(form, formset, extra=extra, max_num=max_num,
+    FormSet = formset_factory(form, formset, extra=extra, max_num=max_num, min_num=min_num,
                               can_order=can_order, can_delete=can_delete)
     FormSet.model = model
     return FormSet
@@ -806 +806 @@
 def inlineformset_factory(parent_model, model, form=ModelForm,
                           formset=BaseInlineFormSet, fk_name=None,
                           fields=None, exclude=None,
-                          extra=3, can_order=False, can_delete=True, max_num=None,
+                          extra=3, can_order=False, can_delete=True, max_num=None, min_num=None,
                           formfield_callback=None):
     """
     Returns an ``InlineFormSet`` for the given kwargs.
@@ -828 +828 @@
         'fields': fields,
         'exclude': exclude,
         'max_num': max_num,
+        'min_num': min_num,
     }
     FormSet = modelformset_factory(model, **kwargs)
     FormSet.fk = fk

docs/ref/contrib/admin/index.txt

@@ -1465 +1465 @@
     doesn't directly correlate to the number of objects, but can if the value
     is small enough. See :ref:`model-formsets-max-num` for more information.
 
+.. attribute:: InlineModelAdmin.min_num
+
+    .. versionadded:: 1.4
+
+    This controls the minumum number of forms to show in the inline.
+    See :ref:`formsets-min-num` for more information.
+
+    .. _ref-contrib-admin-inline-min-num:
+
 .. attribute:: InlineModelAdmin.raw_id_fields
 
     By default, Django's admin uses a select-box interface (<select>) for

docs/topics/forms/formsets.txt

@@ -117 +117 @@
 Ensuring the minimum number of forms
 ------------------------------------
 
+.. versionadded:: 1.4
+
 The ``min_num`` parameter to ``formset_factory`` gives you the ability to make
 sure that at least a certain number of forms will be displayed::
 
@@ -133 +135 @@
     <tr><th><label for="id_form-1-title">Title:</label></th><td><input type="text" name="form-1-title" id="id_form-1-title" /></td></tr>
     <tr><th><label for="id_form-1-pub_date">Pub date:</label></th><td><input type="text" name="form-1-pub_date" id="id_form-1-pub_date" /></td></tr>
 
-.. versionchanged:: 1.4
 
 If the value of ``min_num`` is greater than the number of elements that would
 be displayed normally (including extra forms), additional blank forms will be

tests/regressiontests/generic_inline_admin/admin.py

@@ -4 +4 @@
 from django.contrib.contenttypes import generic
 
 from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact,
-    Category, EpisodePermanent, EpisodeMaxNum)
+    Category, EpisodePermanent, EpisodeMaxNum, EpisodeMinNum)
 
 
 site = admin.AdminSite(name="admin")
@@ -29 +29 @@
     extra = 5
     max_num = 2
 
+class MediaMinNumInline(generic.GenericTabularInline):
+    model = Media
+    extra = 1
+    min_num = 3
 
 class PhoneNumberInline(generic.GenericTabularInline):
     model = PhoneNumber
@@ -42 +46 @@
 site.register(Episode, EpisodeAdmin)
 site.register(EpisodeExtra, inlines=[MediaExtraInline])
 site.register(EpisodeMaxNum, inlines=[MediaMaxNumInline])
+site.register(EpisodeMinNum, inlines=[MediaMinNumInline])
 site.register(Contact, inlines=[PhoneNumberInline])
 site.register(Category)
 site.register(EpisodePermanent, inlines=[MediaPermanentInline])

tests/regressiontests/generic_inline_admin/models.py

@@ -42 +42 @@
 class EpisodeMaxNum(Episode):
     pass
 
+#
+# Generic inline with extra and min_num
+#
+class EpisodeMinNum(Episode):
+    pass
 
 #
 # Generic inline with unique_together

tests/regressiontests/generic_inline_admin/tests.py

@@ -12 +12 @@
 
 # local test models
 from .admin import MediaInline, MediaPermanentInline
-from .models import (Episode, EpisodeExtra, EpisodeMaxNum, Media,
+from .models import (Episode, EpisodeExtra, EpisodeMaxNum, EpisodeMinNum, Media,
     EpisodePermanent, Category)
 
 
@@ -174 +174 @@
         With extra=5 and max_num=2, there should be only 2 forms.
         """
         e = self._create_object(EpisodeMaxNum)
-        inline_form_data = '<input type="hidden" name="generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" value="2" id="id_generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" value="1" id="id_generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" />'
+        inline_form_data = """<input id="id_generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" name="generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" type="hidden" value="2" /><input id="id_generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" name="generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" type="hidden" value="1" /><input id="id_generic_inline_admin-media-content_type-object_id-MAX_NUM_FORMS" name="generic_inline_admin-media-content_type-object_id-MAX_NUM_FORMS" type="hidden" value="2" /><input id="id_generic_inline_admin-media-content_type-object_id-MIN_NUM_FORMS" name="generic_inline_admin-media-content_type-object_id-MIN_NUM_FORMS" type="hidden" />"""
+
         response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/episodemaxnum/%s/' % e.pk)
         formset = response.context['inline_admin_formsets'][0].formset
+
+        self.assertHTMLEqual( str(formset.management_form), inline_form_data )
         self.assertEqual(formset.total_form_count(), 2)
         self.assertEqual(formset.initial_form_count(), 1)
 
+    def testMinNumParam(self):
+        """
+        With extra=1 and min_num=3, there should be exactly 3 forms, one filled and 2 blank.
+        """
+        e = self._create_object(EpisodeMinNum)
+        inline_form_data =  """<input type="hidden" name="generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" value="3" id="id_generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" value="1" id="id_generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-MAX_NUM_FORMS" id="id_generic_inline_admin-media-content_type-object_id-MAX_NUM_FORMS" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-MIN_NUM_FORMS" value="3" id="id_generic_inline_admin-media-content_type-object_id-MIN_NUM_FORMS" />"""
+
+        response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/episodeminnum/%s/' % e.pk)
+        formset = response.context['inline_admin_formsets'][0].formset
+
+        self.assertHTMLEqual( str(formset.management_form), inline_form_data )
+        self.assertEqual(formset.total_form_count(), 3)
+        self.assertEqual(formset.initial_form_count(), 1)
 
 class GenericInlineAdminWithUniqueTogetherTest(TestCase):
     urls = "regressiontests.generic_inline_admin.urls"