Commit 2e059204 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed a breakage with ManyToManyFields in admin caused by r10140. Refs #9994. 

Merge of r10170 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent dce8fdbc

django/db/models/fields/related.py

+8 −0
Original line number Diff line number Diff line
@@ -637,6 +637,14 @@ class ManyToManyRel(object): 
        self.multiple = True

        self.through = through



    def get_related_field(self):

        """

        Returns the field in the to' object to which this relationship is tied

        (this is always the primary key on the target model). Provided for

        symmetry with ManyToOneRel.

        """

        return self.to._meta.pk



class ForeignKey(RelatedField, Field):

    empty_strings_allowed = False

    def __init__(self, to, to_field=None, rel_class=ManyToOneRel, **kwargs):