Ticket #9122: generic_inline_with_tests.diff

django/contrib/contenttypes/generic.py

@@ -345 +345 @@
         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) # make sure we have list not tuple
         exclude.extend([ct_field.name, fk_field.name])
     else:
         exclude = [ct_field.name, fk_field.name]
@@ -377 +378 @@
             "can_delete": True,
             "can_order": False,
             "fields": fields,
+            "max_num": self.max_num,
+            "exclude": self.exclude
         }
         return generic_inlineformset_factory(self.model, **defaults)
 

tests/regressiontests/generic_inline_admin/tests.py

@@ -4 +4 @@
 from django.conf import settings
 
 # local test models
-from models import Episode, Media
+from models import Episode, EpisodeExtra, EpisodeMaxNum, EpisodeExclude, Media
 
 class GenericAdminViewTest(TestCase):
     fixtures = ['users.xml']
@@ -71 +71 @@
         }
         response = self.client.post('/generic_inline_admin/admin/generic_inline_admin/episode/1/', post_data)
         self.failUnlessEqual(response.status_code, 302) # redirect somewhere
+
+class GenericInlineAdminParametersTest(TestCase):
+    fixtures = ['users.xml']
+
+    def setUp(self):
+        self.client.login(username='super', password='secret')
+        
+        # Can't load content via a fixture (since the GenericForeignKey
+        # relies on content type IDs, which will vary depending on what
+        # other tests have been run), thus we do it here.
+        test_classes = [
+            Episode,
+            EpisodeExtra,
+            EpisodeMaxNum,
+            EpisodeExclude,
+        ]
+        for klass in test_classes:
+            e = klass.objects.create(name='This Week in Django')
+            m = Media(content_object=e, url='http://example.com/podcast.mp3')
+            m.save()
+    
+    def tearDown(self):
+        self.client.logout()
+
+    def testNoParam(self):
+        # There is one INITIAL_FORM, and extra defaults to 3, so there
+        # should be 4 TOTAL_FORMS
+        inline_form_data = '<input type="hidden" name="generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" value="4" id="id_generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" value="1" id="id_generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" />'
+        response= self.client.get('/generic_inline_admin/admin/generic_inline_admin/episode/1/')
+        self.assertContains(response, inline_form_data)
+
+    def testExtraParam(self):
+        # Both TOTAL_FORMS and INITIAL_FORMS should be the same number
+        inline_form_data ='<input type="hidden" name="generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" value="1" id="id_generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" value="1" id="id_generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" />'
+        response= self.client.get('/generic_inline_admin/admin/generic_inline_admin/episodeextra/2/')
+        self.assertContains(response, inline_form_data)
+
+    def testMaxNumParam(self):
+        # Even though the extra param is set to 5, max_num should
+        # override that, keeping TOTAL_FORMS to 2.
+        inline_form_data = '<input type="hidden" name="generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" value="2" id="id_generic_inline_admin-media-content_type-object_id-TOTAL_FORMS" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" value="1" id="id_generic_inline_admin-media-content_type-object_id-INITIAL_FORMS" />'
+        response= self.client.get('/generic_inline_admin/admin/generic_inline_admin/episodemaxnum/3/')
+        self.assertContains(response, inline_form_data)
+
+    def testExcludeParam(self):
+        # Since we are excluding the url field, the form shouldn't have the
+        # url field.
+        response= self.client.get('/generic_inline_admin/admin/generic_inline_admin/episodeexclude/4/')
+        self.assertNotContains(response, 'url')

tests/regressiontests/generic_inline_admin/models.py

@@ -20 +20 @@
 
 class MediaInline(generic.GenericTabularInline):
     model = Media
-    extra = 1
     
 class EpisodeAdmin(admin.ModelAdmin):
     inlines = [
         MediaInline,
     ]
+admin.site.register(Episode, EpisodeAdmin)
 
-admin.site.register(Episode, EpisodeAdmin)
+####################
+# These models let us test the different GenericInline settings at
+# different urls in the admin site. There might be a better way to do this,
+# but this works.
+####################
+class EpisodeExtra(Episode):
+    pass
+
+class MediaExtraInline(generic.GenericTabularInline):
+    model = Media
+    extra = 0
+
+class EpisodeExtraAdmin(admin.ModelAdmin):
+    inlines = [
+        MediaExtraInline,
+    ]
+admin.site.register(EpisodeExtra, EpisodeExtraAdmin)
+
+class EpisodeMaxNum(Episode):
+    pass
+
+class MediaMaxNumInline(generic.GenericTabularInline):
+    model = Media
+    extra = 5
+    max_num = 2
+
+class EpisodeMaxNumAdmin(admin.ModelAdmin):
+    inlines = [
+        MediaMaxNumInline,
+    ]
+admin.site.register(EpisodeMaxNum, EpisodeMaxNumAdmin)
+
+class EpisodeExclude(Episode):
+    pass
+
+class MediaExcludeInline(generic.GenericTabularInline):
+    model = Media
+    exclude = ['url']
+
+class EpisodeExcludeAdmin(admin.ModelAdmin):
+    inlines = [
+        MediaExcludeInline,
+    ]
+admin.site.register(EpisodeExclude, EpisodeExcludeAdmin)
+

AUTHORS

@@ -335 +335 @@
     ricardojbarrios@gmail.com
     Mike Richardson
     Matt Riggott
+    Alex Robbins <alexander.j.robbins@gmail.com>
     Henrique Romano <onaiort@gmail.com>
     Armin Ronacher
     Daniel Roseman <http://roseman.org.uk/>