summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Rosner <brosner@gmail.com>2008-06-10 04:59:12 +0000
committerBrian Rosner <brosner@gmail.com>2008-06-10 04:59:12 +0000
commitc63faa1f49bfa6bb6d3c933195713f060469bbfe (patch)
tree471c936970668831f7427dc98727206d3de3a7d4
parent07b82590d8de46ece98f94d511fdc57163e76c8c (diff)
newforms-admin: Allow a custom formset on InlineModelAdmin.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/options.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 535c9b9b52..1aa56f2c91 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -2,6 +2,7 @@ from django import oldforms, template
from django import newforms as forms
from django.newforms.formsets import all_valid
from django.newforms.models import modelform_factory, inlineformset_factory
+from django.newforms.models import BaseInlineFormset
from django.contrib.contenttypes.models import ContentType
from django.contrib.admin import widgets
from django.contrib.admin.util import get_deleted_objects
@@ -696,6 +697,7 @@ class InlineModelAdmin(BaseModelAdmin):
"""
model = None
fk_name = None
+ formset = BaseInlineFormset
extra = 3
template = None
verbose_name = None
@@ -717,7 +719,10 @@ class InlineModelAdmin(BaseModelAdmin):
fields = flatten_fieldsets(self.declared_fieldsets)
else:
fields = None
- return inlineformset_factory(self.parent_model, self.model, form=self.form, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
+ return inlineformset_factory(self.parent_model, self.model,
+ form=self.form, formset=self.formset, fk_name=self.fk_name,
+ fields=fields, formfield_callback=self.formfield_for_dbfield,
+ extra=self.extra)
def get_fieldsets(self, request, obj=None):
if self.declared_fieldsets: