mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-01 12:25:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #12664 -- Fixed GenericRelation.m2m_reverse_name to return the correct pk column name.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2010-01-22 18:39:48 +00:00
parent 5ec44450df
commit c1584383fa
3 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tests/regressiontests/generic_relations_regress/models.py
View file

@ -13,10 +13,30 @@ class Link(models.Model):
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):
class Restaurant(Place):
def __unicode__(self):
return "Restaurant: %s" % self.name
return "Restaurant: %s" % self.name
class Address(models.Model):
street = models.CharField(max_length=80)
city = models.CharField(max_length=50)
state = models.CharField(max_length=2)
zipcode = models.CharField(max_length=5)
content_type = models.ForeignKey(ContentType)
object_id = models.PositiveIntegerField()
content_object = generic.GenericForeignKey()
def __unicode__(self):
return '%s %s, %s %s' % (self.street, self.city, self.state, self.zipcode)
class Person(models.Model):
account = models.IntegerField(primary_key=True)
name = models.CharField(max_length=128)
addresses = generic.GenericRelation(Address)
def __unicode__(self):
return self.name