Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #9546: GenericRelations inherited from base models no l…

…onger query using the wrong content type. Backport of r10373 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 9907495b3c412ece76f5e5e4c4e5df12b93caf78 1 parent 5971021
@jacobian jacobian authored
View
6 django/contrib/contenttypes/generic.py
@@ -193,9 +193,9 @@ def __get__(self, instance, instance_type=None):
rel_model = self.field.rel.to
superclass = rel_model._default_manager.__class__
RelatedManager = create_generic_related_manager(superclass)
-
+
qn = connection.ops.quote_name
-
+
manager = RelatedManager(
model = rel_model,
instance = instance,
@@ -203,7 +203,7 @@ def __get__(self, instance, instance_type=None):
join_table = qn(self.field.m2m_db_table()),
source_col_name = qn(self.field.m2m_column_name()),
target_col_name = qn(self.field.m2m_reverse_name()),
- content_type = ContentType.objects.get_for_model(self.field.model),
+ content_type = ContentType.objects.get_for_model(instance),
content_type_field_name = self.field.content_type_field_name,
object_id_field_name = self.field.object_id_field_name
)
View
0  tests/regressiontests/generic_relations_regress/__init__.py
No changes.
View
22 tests/regressiontests/generic_relations_regress/models.py
@@ -0,0 +1,22 @@
+from django.db import models
+from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.models import ContentType
+
+class Link(models.Model):
+ content_type = models.ForeignKey(ContentType)
+ object_id = models.PositiveIntegerField()
+ content_object = generic.GenericForeignKey()
+
+ def __unicode__(self):
+ return "Link to %s id=%s" % (self.content_type, self.object_id)
+
+class Place(models.Model):
+ name = models.CharField(max_length=100)
+ links = generic.GenericRelation(Link)
+
+ def __unicode__(self):
+ return "Place: %s" % self.name
+
+class Restaurant(Place):
+ def __unicode__(self):
+ return "Restaurant: %s" % self.name
View
19 tests/regressiontests/generic_relations_regress/tests.py
@@ -0,0 +1,19 @@
+from django.test import TestCase
+from django.contrib.contenttypes.models import ContentType
+from models import Link, Place, Restaurant
+
+class GenericRelationTests(TestCase):
+
+ def test_inherited_models_content_type(self):
+ """
+ Test that GenericRelations on inherited classes use the correct content
+ type.
+ """
+
+ p = Place.objects.create(name="South Park")
+ r = Restaurant.objects.create(name="Chubby's")
+ l1 = Link.objects.create(content_object=p)
+ l2 = Link.objects.create(content_object=r)
+ self.assertEqual(list(p.links.all()), [l1])
+ self.assertEqual(list(r.links.all()), [l2])
+
Please sign in to comment.
Something went wrong with that request. Please try again.