summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-04-18 20:17:17 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-04-18 20:17:17 +0000
commit01669a356ae8d10a4332c6f21590176b6bedfe0c (patch)
tree1d78952ae438e63aac2f2c75ce85c17cbed4cb2a /django
parent681a26ca9028838a2e790824b7e40b2dff3c252b (diff)
[1.0.X] Fixed #9122: generic inline formsets now respect exclude and max_num. Thanks, Alex Robbins. Backport of [10586] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/contenttypes/generic.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py
index 9fd2550185..5564548133 100644
--- a/django/contrib/contenttypes/generic.py
+++ b/django/contrib/contenttypes/generic.py
@@ -389,6 +389,8 @@ class GenericInlineModelAdmin(InlineModelAdmin):
"can_delete": True,
"can_order": False,
"fields": fields,
+ "max_num": self.max_num,
+ "exclude": self.exclude
}
return generic_inlineformset_factory(self.model, **defaults)