Ticket #12561: patch-12561.diff

django/contrib/admin/options.py

@@ -1227 +1227 @@
             "formfield_callback": curry(self.formfield_for_dbfield, request=request),
             "extra": self.extra,
             "max_num": self.max_num,
+            "can_delete": self.can_delete,
+            "can_order": self.can_order,
         }
         defaults.update(kwargs)
         return inlineformset_factory(self.parent_model, self.model, **defaults)

tests/regressiontests/admin_inlines/tests.py

@@ +1 @@
+# coding: utf-8
+
+from django.test import TestCase
+from django.contrib import admin
+
+# local test models
+from models import Holder, Inner
+
+class TestInline(TestCase):
+    fixtures = ['admin-views-users.xml']
+
+    def setUp(self):
+        self.holder = Holder(dummy=13)
+        self.holder.save()
+        Inner(dummy=42, holder=self.holder).save()
+
+        result = self.client.login(username='super', password='secret')
+        self.failUnlessEqual(result, True)
+
+    def tearDown(self):
+        Inner.objects.all().delete()
+        Holder.objects.all().delete()
+        self.client.logout()
+
+    def test_can_delete(self):
+        """
+        can_delete should be passed to inlineformset factory.
+        """
+        url = '/test_admin/admin/admin_inlines/holder/%i/' % self.holder.id
+        response = self.client.get(url)
+        with file('test.html', 'w') as f:
+            f.write(str(response))
+        self.assertNotContains(response, text='name="neverdeletemodel_set-0-DELETE"')

tests/regressiontests/admin_inlines/models.py

@@ -3 +3 @@
 
 """
 from django.db import models
+from django.contrib import admin
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 
@@ -29 +30 @@
     def __unicode__(self):
         return u'I am %s, a child of %s' % (self.name, self.parent)
 
+
+class Holder(models.Model):
+    dummy = models.IntegerField()
+
+
+class Inner(models.Model):
+    dummy = models.IntegerField()
+    holder = models.ForeignKey(Holder)
+
+
+class InnerInline(admin.StackedInline):
+    model = Inner
+    can_delete = False
+    can_order = True
+
+
+# Test bug #12561
+admin.site.register(Holder, inlines=[InnerInline])
+
 __test__ = {'API_TESTS': """
 
 # Regression test for #9362