p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #9588 -- Allow passing kwargs to `GenericInlineModelAdmin.get_formset` just like the InlineModelAdmin. Thanks, prestontimmons. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-06-16 16:35:04 +00:00
parent 97f22f2969
commit 30e842632e
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/contenttypes/generic.py
View File

@ -396,7 +396,7 @@ class GenericInlineModelAdmin(InlineModelAdmin):
ct_fk_field = "object_id" ct_fk_field = "object_id"
formset = BaseGenericInlineFormSet formset = BaseGenericInlineFormSet
def get_formset(self, request, obj=None): def get_formset(self, request, obj=None, **kwargs):
if self.declared_fieldsets: if self.declared_fieldsets:
fields = flatten_fieldsets(self.declared_fieldsets) fields = flatten_fieldsets(self.declared_fieldsets)
else: else:
@ -420,6 +420,7 @@ class GenericInlineModelAdmin(InlineModelAdmin):
"max_num": self.max_num, "max_num": self.max_num,
"exclude": exclude "exclude": exclude
} }
defaults.update(kwargs)
return generic_inlineformset_factory(self.model, **defaults) return generic_inlineformset_factory(self.model, **defaults)
class GenericStackedInline(GenericInlineModelAdmin): class GenericStackedInline(GenericInlineModelAdmin):

20
tests/regressiontests/generic_inline_admin/tests.py
View File

@ -1,12 +1,13 @@
# coding: utf-8 # coding: utf-8
from django.conf import settings from django.conf import settings
from django.contrib.admin.sites import AdminSite
from django.contrib.contenttypes.generic import generic_inlineformset_factory from django.contrib.contenttypes.generic import generic_inlineformset_factory
from django.test import TestCase from django.test import TestCase
# local test models # local test models
from models import Episode, EpisodeExtra, EpisodeMaxNum, EpisodeExclude, \ from models import (Episode, EpisodeExtra, EpisodeMaxNum, EpisodeExclude,
Media, EpisodePermanent, MediaPermanentInline, Category Media, MediaInline, EpisodePermanent, MediaPermanentInline, Category)
class GenericAdminViewTest(TestCase): class GenericAdminViewTest(TestCase):
@ -214,3 +215,18 @@ class NoInlineDeletionTest(TestCase):
fake_request = object() fake_request = object()
formset = inline.get_formset(fake_request) formset = inline.get_formset(fake_request)
self.assertFalse(formset.can_delete) self.assertFalse(formset.can_delete)
class GenericInlineModelAdminTest(TestCase):
def test_get_formset_kwargs(self):
media_inline = MediaInline(Media, AdminSite())
# Create a formset with default arguments
formset = media_inline.get_formset(None)
self.assertEqual(formset.max_num, None)
self.assertEqual(formset.can_order, False)
# Create a formset with custom keyword arguments
formset = media_inline.get_formset(None, max_num=100, can_order=True)
self.assertEqual(formset.max_num, 100)
self.assertEqual(formset.can_order, True)