Ticket #12561: patch-12561-1.diff

django/contrib/admin/options.py

@@ -1182 +1182 @@
     template = None
     verbose_name = None
     verbose_name_plural = None
+    can_delete = False
+    can_order = False
 
     def __init__(self, parent_model, admin_site):
         self.admin_site = admin_site
@@ -1227 +1229 @@
             "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/modeladmin/models.py

@@ -291 +291 @@
 ...     form = AdminConcertForm
 ...     model = Concert
 ...     fk_name = 'main_band'
+...     can_delete = True
 
 >>> class BandAdmin(ModelAdmin):
 ...     inlines = [

tests/regressiontests/admin_inlines/tests.py

@@ +1 @@
+# coding: utf-8
+
+from django.test import TestCase
+
+# local test models
+from models import Holder, Inner, InnerInline
+
+class TestInline(TestCase):
+    fixtures = ['admin-views-users.xml']
+
+    def setUp(self):
+        holder = Holder(dummy=13)
+        holder.save()
+        Inner(dummy=42, holder=holder).save()
+        self.change_url = '/test_admin/admin/admin_inlines/holder/%i/' % holder.id
+
+        result = self.client.login(username='super', password='secret')
+        self.failUnlessEqual(result, True)
+
+    def tearDown(self):
+        self.client.logout()
+
+    def test_can_delete(self):
+        """
+        can_delete should be passed to inlineformset factory.
+        """
+        response = self.client.get(self.change_url)
+        inner_formset = response.context[-1]['inline_admin_formsets'][0].formset
+        expected = InnerInline.can_delete
+        actual = inner_formset.can_delete
+        self.assertEqual(expected, actual, 'can_delete must be equal')
+
+    def test_can_order(self):
+        """
+        can_order should be passed to inlineformset factory.
+        """
+        response = self.client.get(self.change_url)
+        inner_formset = response.context[-1]['inline_admin_formsets'][0].formset
+        expected = InnerInline.can_order
+        actual = inner_formset.can_order
+        self.assertEqual(expected, actual, 'can_order must be equal')

tests/regressiontests/admin_inlines/fixtures/admin-views-users.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+    <object pk="100" model="auth.user">
+        <field type="CharField" name="username">super</field>
+        <field type="CharField" name="first_name">Super</field>
+        <field type="CharField" name="last_name">User</field>
+        <field type="CharField" name="email">super@example.com</field>
+        <field type="CharField" name="password">sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158</field>
+        <field type="BooleanField" name="is_staff">True</field>
+        <field type="BooleanField" name="is_active">True</field>
+        <field type="BooleanField" name="is_superuser">True</field>
+        <field type="DateTimeField" name="last_login">2007-05-30 13:20:10</field>
+        <field type="DateTimeField" name="date_joined">2007-05-30 13:20:10</field>
+        <field to="auth.group" name="groups" rel="ManyToManyRel"></field>
+        <field to="auth.permission" name="user_permissions" rel="ManyToManyRel"></field>
+    </object>
+</django-objects>

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