Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[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
Showing
4 changed files
with
44 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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]) | ||
|