Ticket #4667: 4667-added-custom-formset.diff

django/contrib/admin/options.py

@@ -1 +1 @@
 from django import oldforms, template
 from django import newforms as forms
 from django.newforms.formsets import all_valid
-from django.contrib.contenttypes.models import ContentType
 from django.contrib.admin import widgets
 from django.contrib.admin.util import get_deleted_objects
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
@@ -451 +450 @@
             return HttpResponseRedirect("../")
 
     def render_change_form(self, model, context, add=False, change=False, form_url=''):
+        from django.contrib.contenttypes.models import ContentType
         opts = model._meta
         app_label = opts.app_label
         ordered_objects = opts.get_ordered_objects()
@@ -721 +721 @@
     template = None
     verbose_name = None
     verbose_name_plural = None
+    formset = None
 
     def __init__(self, parent_model, admin_site):
         self.admin_site = admin_site
@@ -738 +739 @@
             fields = flatten_fieldsets(self.declared_fieldsets)
         else:
             fields = None
-        return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
+        return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra, formset=self.formset)
 
     def formset_change(self, request, obj):
         """Returns an InlineFormSet class for use in admin change views."""
@@ -746 +747 @@
             fields = flatten_fieldsets(self.declared_fieldsets)
         else:
             fields = None
-        return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
+        return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra, formset=self.formset)
 
     def fieldsets_add(self, request):
         if self.declared_fieldsets:

django/newforms/models.py

@@ -408 +408 @@
             raise Exception("%s has more than 1 ForeignKey to %s" % (model, parent_model))
     return fk
 
-def inline_formset(parent_model, model, fk_name=None, fields=None, extra=3, orderable=False, deletable=True, formfield_callback=lambda f: f.formfield()):
+def inline_formset(parent_model, model, fk_name=None, fields=None, extra=3, orderable=False, deletable=True, formfield_callback=lambda f: f.formfield(), formset=None):
     """
     Returns an ``InlineFormset`` for the given kwargs.
 
@@ -417 +417 @@
     """
     fk = get_foreign_key(parent_model, model, fk_name=fk_name)
     # let the formset handle object deletion by default
-    FormSet = formset_for_model(model, formset=InlineFormset, fields=fields,
+    FormSet = formset_for_model(model, formset=formset or InlineFormset, fields=fields,
                                 formfield_callback=formfield_callback,
                                 extra=extra, orderable=orderable,
                                 deletable=deletable)