Commit de649700 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Updated BaseGenericInlineFormSet to match the changes made to BaseInlineFormSet in r11874. 

Backport of r11885 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3071d098

django/contrib/contenttypes/generic.py

+14 −15
Original line number Diff line number Diff line
@@ -294,15 +294,27 @@ class BaseGenericInlineFormSet(BaseModelFormSet): 
    ct_field_name = "content_type"

    ct_fk_field_name = "object_id"



    def __init__(self, data=None, files=None, instance=None, save_as_new=None, prefix=None):

    def __init__(self, data=None, files=None, instance=None, save_as_new=None,

                 prefix=None, queryset=None):

        # Avoid a circular import.

        from django.contrib.contenttypes.models import ContentType

        opts = self.model._meta

        self.instance = instance

        self.rel_name = '-'.join((

            opts.app_label, opts.object_name.lower(),

            self.ct_field.name, self.ct_fk_field.name,

        ))

        if self.instance is None or self.instance.pk is None:

            qs = self.model._default_manager.none()

        else:

            if queryset is None:

                queryset = self.model._default_manager

            qs = queryset.filter(**{

                self.ct_field.name: ContentType.objects.get_for_model(self.instance),

                self.ct_fk_field.name: self.instance.pk,

            })

        super(BaseGenericInlineFormSet, self).__init__(

            queryset=self.get_queryset(), data=data, files=files,

            queryset=qs, data=data, files=files,

            prefix=prefix

        )
@@ -314,19 +326,6 @@ class BaseGenericInlineFormSet(BaseModelFormSet): 
        ))

    get_default_prefix = classmethod(get_default_prefix)



    def get_queryset(self):

        # Avoid a circular import.

        from django.contrib.contenttypes.models import ContentType

        if self.instance is None or self.instance.pk is None:

            return self.model._default_manager.none()

        qs = self.model._default_manager.filter(**{

            self.ct_field.name: ContentType.objects.get_for_model(self.instance),

            self.ct_fk_field.name: self.instance.pk,

        })

        if not qs.ordered:

            qs = qs.order_by(self.model._meta.pk.name)

        return qs



    def save_new(self, form, commit=True):

        # Avoid a circular import.

        from django.contrib.contenttypes.models import ContentType

tests/regressiontests/generic_inline_admin/tests.py

+45 −13
Original line number Diff line number Diff line
@@ -25,7 +25,11 @@ class GenericAdminViewTest(TestCase): 
        self.episode_pk = e.pk

        m = Media(content_object=e, url='http://example.com/podcast.mp3')

        m.save()

        self.media_pk = m.pk

        self.mp3_media_pk = m.pk



        m = Media(content_object=e, url='http://example.com/logo.png')

        m.save()

        self.png_media_pk = m.pk



    def tearDown(self):

        self.client.logout()
@@ -65,17 +69,45 @@ class GenericAdminViewTest(TestCase): 
        post_data = {

            "name": u"This Week in Django",

            # inline data

            "generic_inline_admin-media-content_type-object_id-TOTAL_FORMS": u"2",

            "generic_inline_admin-media-content_type-object_id-INITIAL_FORMS": u"1",

            "generic_inline_admin-media-content_type-object_id-0-id": u"%d" % self.media_pk,

            "generic_inline_admin-media-content_type-object_id-TOTAL_FORMS": u"3",

            "generic_inline_admin-media-content_type-object_id-INITIAL_FORMS": u"2",

            "generic_inline_admin-media-content_type-object_id-0-id": u"%d" % self.mp3_media_pk,

            "generic_inline_admin-media-content_type-object_id-0-url": u"http://example.com/podcast.mp3",

            "generic_inline_admin-media-content_type-object_id-1-id": u"",

            "generic_inline_admin-media-content_type-object_id-1-url": u"",

            "generic_inline_admin-media-content_type-object_id-1-id": u"%d" % self.png_media_pk,

            "generic_inline_admin-media-content_type-object_id-1-url": u"http://example.com/logo.png",

            "generic_inline_admin-media-content_type-object_id-2-id": u"",

            "generic_inline_admin-media-content_type-object_id-2-url": u"",

        }

        url = '/generic_inline_admin/admin/generic_inline_admin/episode/%d/' % self.episode_pk

        response = self.client.post(url, post_data)

        self.failUnlessEqual(response.status_code, 302) # redirect somewhere



    def testGenericInlineFormset(self):

        EpisodeMediaFormSet = generic_inlineformset_factory(Media, can_delete=False, extra=3)

        e = Episode.objects.get(name='This Week in Django')



        # Works with no queryset

        formset = EpisodeMediaFormSet(instance=e)

        self.assertEquals(len(formset.forms), 5)

        self.assertEquals(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="text" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/podcast.mp3" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="1" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>')

        self.assertEquals(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="text" name="generic_inline_admin-media-content_type-object_id-1-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" value="2" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>')

        self.assertEquals(formset.forms[2].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-2-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-2-url" type="text" name="generic_inline_admin-media-content_type-object_id-2-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-2-id" id="id_generic_inline_admin-media-content_type-object_id-2-id" /></p>')



        # A queryset can be used to alter display ordering

        formset = EpisodeMediaFormSet(instance=e, queryset=Media.objects.order_by('url'))

        self.assertEquals(len(formset.forms), 5)

        self.assertEquals(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="text" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="2" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>')

        self.assertEquals(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="text" name="generic_inline_admin-media-content_type-object_id-1-url" value="http://example.com/podcast.mp3" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" value="1" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>')

        self.assertEquals(formset.forms[2].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-2-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-2-url" type="text" name="generic_inline_admin-media-content_type-object_id-2-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-2-id" id="id_generic_inline_admin-media-content_type-object_id-2-id" /></p>')





        # Works with a queryset that omits items

        formset = EpisodeMediaFormSet(instance=e, queryset=Media.objects.filter(url__endswith=".png"))

        self.assertEquals(len(formset.forms), 4)

        self.assertEquals(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="text" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="2" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>')

        self.assertEquals(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="text" name="generic_inline_admin-media-content_type-object_id-1-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>')





    def testGenericInlineFormsetFactory(self):

        # Regression test for #10522.

        inline_formset = generic_inlineformset_factory(Media,

tests/regressiontests/generic_inline_admin/models.py

+2 −2

File changed.

Contains only whitespace changes.