Ticket #9863: 9683.2.diff

django/forms/models.py

@@ -545 +545 @@
         if self._pk_field == self.fk:
             form.fields[self._pk_field.name] = InlineForeignKeyField(self.instance, pk_field=True)
         else:
-            form.fields[self.fk.name] = InlineForeignKeyField(self.instance, label=form.fields[self.fk.name].label)
+            # the foreign key field might not be on the form, so we poke at the
+            # Model Field to get the label, since we need that for error messages
+            form.fields[self.fk.name] = InlineForeignKeyField(self.instance,
+                label=getattr(form.fields.get(self.fk.name), 'label', capfirst(self.fk.verbose_name))
+            )
 
 def _get_foreign_key(parent_model, model, fk_name=None):
     """

tests/regressiontests/admin_views/models.py

@@ -248 +248 @@
 
     ordering = ('name',)
 
+class Parent(models.Model):
+    name = models.CharField(max_length = 128, db_index = True)
+
+class Child(models.Model):
+    parent = models.ForeignKey(Parent, related_name = 'child_set', editable = False)
+    name = models.CharField(max_length = 30, blank = True)
+
+class ChildInline(admin.StackedInline):
+    model = Child
+    extra = 10
+
+class ParentAdmin(admin.ModelAdmin):
+    model = Parent
+    inlines = [
+       ChildInline,
+    ]
+
 admin.site.register(Article, ArticleAdmin)
 admin.site.register(CustomArticle, CustomArticleAdmin)
 admin.site.register(Section, inlines=[ArticleInline])
@@ -259 +276 @@
 admin.site.register(Subscriber, SubscriberAdmin)
 admin.site.register(ExternalSubscriber, ExternalSubscriberAdmin)
 admin.site.register(Podcast, PodcastAdmin)
+admin.site.register(Parent, ParentAdmin)
 
 # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.
 # That way we cover all four cases:

tests/regressiontests/admin_views/tests.py

@@ -946 +946 @@
         }
         response = self.client.post('/test_admin/admin/admin_views/externalsubscriber/', action_data)
         self.failUnlessEqual(response.status_code, 302)
+
+class TestInlineNotEditable(TestCase):
+    fixtures = ['admin-views-users.xml', ]
+
+    def setUp(self):
+        result = self.client.login(username='super', password='secret')
+        self.failUnlessEqual(result, True)
+
+    def tearDown(self):
+        self.client.logout()
+
+    def test(self):
+        """
+        InlineModelAdmin broken?
+        """
+        response = self.client.get('/test_admin/admin/admin_views/parent/add/')
+        self.failUnlessEqual(response.status_code, 200)