Ticket #10799: list-editable.diff

django/db/models/fields/related.py

@@ -955 +955 @@
         # A ManyToManyField is not represented by a single column,
         # so return None.
         return None
-

django/forms/models.py

@@ -469 +469 @@
         # data back. Generally, pk.editable should be false, but for some
         # reason, auto_created pk fields and AutoField's editable attribute is
         # True, so check for that as well.
-        if (not pk.editable) or (pk.auto_created or isinstance(pk, AutoField)):
+        def pk_is_editable(pk):
+            return ((not pk.editable) or (pk.auto_created or isinstance(pk, AutoField))
+                or (pk.rel and pk.rel.parent_link and pk_is_editable(pk.rel.to._meta.pk)))
+        if pk_is_editable(pk):
             try:
                 pk_value = self.get_queryset()[index].pk
             except IndexError:

tests/modeltests/model_formsets/models.py

@@ -58 +58 @@
 class Place(models.Model):
     name = models.CharField(max_length=50)
     city = models.CharField(max_length=50)
-    
+
     def __unicode__(self):
         return self.name
 
@@ -85 +85 @@
 
 class Restaurant(Place):
     serves_pizza = models.BooleanField()
-    
+
     def __unicode__(self):
         return self.name
 
@@ -108 +108 @@
 class MexicanRestaurant(Restaurant):
     serves_tacos = models.BooleanField()
 
+class ClassyMexicanRestaurant(MexicanRestaurant):
+    restaurant = models.OneToOneField(MexicanRestaurant, parent_link=True, primary_key=True)
+    tacos_are_yummy = models.BooleanField()
+
 # models for testing unique_together validation when a fk is involved and
 # using inlineformset_factory.
 class Repository(models.Model):
@@ -569 +573 @@
 ...     print book.title
 Les Fleurs du Mal
 
-Test inline formsets where the inline-edited object uses multi-table inheritance, thus 
+Test inline formsets where the inline-edited object uses multi-table inheritance, thus
 has a non AutoField yet auto-created primary key.
 
 >>> AuthorBooksFormSet3 = inlineformset_factory(Author, AlternateBook, can_delete=False, extra=1)
@@ -736 +740 @@
 >>> formset.save()
 [<OwnerProfile: Joe Perry is 55>]
 
-# ForeignKey with unique=True should enforce max_num=1 
+# ForeignKey with unique=True should enforce max_num=1
 
 >>> FormSet = inlineformset_factory(Place, Location, can_delete=False)
 >>> formset = FormSet(instance=place)
@@ -934 +938 @@
 >>> formset.get_queryset()
 [<Player: Bobby>]
 
+# a formset for a Model that has a custom primary key that still needs to be
+# added to the formset automatically
+>>> FormSet = modelformset_factory(ClassyMexicanRestaurant, fields=["tacos_are_yummy"])
+>>> sorted(FormSet().forms[0].fields.keys())
+['restaurant', 'tacos_are_yummy']
 """}

tests/regressiontests/admin_views/models.py

@@ -266 +266 @@
 
     ordering = ('name',)
 
+class Vodcast(Media):
+    media = models.OneToOneField(Media, primary_key=True, parent_link=True)
+    released = models.BooleanField(default=False)
+
+class VodcastAdmin(admin.ModelAdmin):
+    list_display = ('name', 'released')
+    list_editable = ('released',)
+
+    ordering = ('name',)
+
 class Parent(models.Model):
     name = models.CharField(max_length=128)
 
@@ -303 +313 @@
 admin.site.register(ExternalSubscriber, ExternalSubscriberAdmin)
 admin.site.register(OldSubscriber, OldSubscriberAdmin)
 admin.site.register(Podcast, PodcastAdmin)
+admin.site.register(Vodcast, VodcastAdmin)
 admin.site.register(Parent, ParentAdmin)
 admin.site.register(EmptyModel, EmptyModelAdmin)
 admin.site.register(Fabric, FabricAdmin)

tests/regressiontests/admin_views/tests.py

@@ -13 +13 @@
 from django.utils.html import escape
 
 # local test models
-from models import Article, CustomArticle, Section, ModelWithStringPrimaryKey, Person, Persona, FooAccount, BarAccount, Subscriber, ExternalSubscriber, Podcast, EmptyModel
+from models import Article, CustomArticle, Section, ModelWithStringPrimaryKey, Person, Persona, FooAccount, BarAccount, Subscriber, ExternalSubscriber, Vodcast, Podcast, EmptyModel
 
 try:
     set
@@ -796 +796 @@
         response = self.client.get('/test_admin/admin/admin_views/podcast/')
         self.failUnlessEqual(response.status_code, 200)
 
+    def test_inheritance_2(self):
+        Vodcast.objects.create(name="This Week in Django", released=True)
+        response = self.client.get('/test_admin/admin/admin_views/vodcast/')
+        self.failUnlessEqual(response.status_code, 200)
+
     def test_changelist_input_html(self):
         response = self.client.get('/test_admin/admin/admin_views/person/')
         # 2 inputs per object(the field and the hidden id field) = 6
@@ -995 +1000 @@
         }
         response = self.client.post('/test_admin/admin/admin_views/externalsubscriber/', action_data)
         self.failUnlessEqual(response.status_code, 302)
-        
+
     def test_model_without_action(self):
         "Tests a ModelAdmin without any action"
         response = self.client.get('/test_admin/admin/admin_views/oldsubscriber/')
@@ -1004 +1009 @@
             '<input type="checkbox" class="action-select"' not in response.content,
             "Found an unexpected action toggle checkboxbox in response"
         )
-        
+
     def test_multiple_actions_form(self):
         """
         Test that actions come from the form whose submit button was pressed (#10618).