Ticket #9317: 0001-Right-content-type-if-parent-object-if-given-and-ac.patch

django/contrib/contenttypes/models.py

@@ -1 +1 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode
+from django.db.models.query import CollectedObjects
+from django.db.models import Model
 
 class ContentTypeManager(models.Manager):
 
@@ -14 +16 @@
         ContentType if necessary. Lookups are cached so that subsequent lookups
         for the same model don't hit the database.
         """
+        if isinstance(model, Model):
+            # model inheritance support
+            sub_objects = CollectedObjects()
+            model._collect_sub_objects(sub_objects)
+            model = sub_objects.items()[0][1].values()[0]
+
         opts = model._meta
         key = (opts.app_label, opts.object_name.lower())
         try:

django/contrib/contenttypes/tests.py

@@ -44 +44 @@
 Don't forget to reset DEBUG!
 
     >>> settings.DEBUG = False
-"""
- No newline at end of file
+"""
+
+import unittest
+from django.db import models
+from models import ContentType
+
+class Parent(models.Model): pass
+class Child(Parent): pass
+class Child2(Parent): pass
+
+
+class Inheritance(unittest.TestCase):
+    def setUp(self):
+        Parent.objects.all().delete()
+
+    def testInheritance(self):
+        child = Child()
+        child.save()
+
+        parent = Parent.objects.get(id=child.parent_ptr_id)
+
+        parent_ct = ContentType.objects.get_for_model(parent)
+        child_ct = ContentType.objects.get_for_model(child)
+
+        self.assertEqual(parent_ct, child_ct)
+
+    def testInheritanceWithMultipleChilds(self):
+        child1 = Child()
+        child1.save()
+
+        child2 = Child2()
+        child2.save()
+
+        self.assertEqual(2, Parent.objects.all().count())
+
+        parent1 = Parent.objects.get(id=child1.parent_ptr_id)
+        parent1_ct = ContentType.objects.get_for_model(parent1)
+
+        parent2 = Parent.objects.get(id=child2.parent_ptr_id)
+        parent2_ct = ContentType.objects.get_for_model(parent2)
+
+        child1_ct = ContentType.objects.get_for_model(child1)
+        child2_ct = ContentType.objects.get_for_model(child2)
+
+        self.assertNotEqual(child1_ct, child2_ct)
+        self.assertEqual(parent1_ct, child1_ct)
+        self.assertEqual(parent2_ct, child2_ct)
+