Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #10522: accept tuples in `generic_inlineformset_factor(…

…exclude)`. Thanks, mk. Backport of r10375 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit fbffc2e943eba73715d1564f437ca4ee028de9d3 1 parent 9907495
Jacob Kaplan-Moss jacobian authored
1  django/contrib/contenttypes/generic.py
View
@@ -355,6 +355,7 @@ def generic_inlineformset_factory(model, form=ModelForm,
raise Exception("fk_name '%s' is not a ForeignKey to ContentType" % ct_field)
fk_field = opts.get_field(fk_field) # let the exception propagate
if exclude is not None:
+ exclude = list(exclude)
exclude.extend([ct_field.name, fk_field.name])
else:
exclude = [ct_field.name, fk_field.name]
6 tests/regressiontests/generic_inline_admin/tests.py
View
@@ -2,6 +2,7 @@
from django.test import TestCase
from django.conf import settings
+from django.contrib.contenttypes.generic import generic_inlineformset_factory
# local test models
from models import Episode, Media
@@ -71,3 +72,8 @@ def testBasicEditPost(self):
}
response = self.client.post('/generic_inline_admin/admin/generic_inline_admin/episode/1/', post_data)
self.failUnlessEqual(response.status_code, 302) # redirect somewhere
+
+ def testGenericInlineFormsetFactory(self):
+ # Regression test for #10522.
+ inline_formset = generic_inlineformset_factory(Media,
+ exclude=('url',))
Please sign in to comment.
Something went wrong with that request. Please try again.