Commit 209f174e authored by Anssi Kääriäinen's avatar Anssi Kääriäinen
Browse files

[1.4.x] Made custom m2m fields without through easier to use 

The change in f105fbe5 made through=None
m2m fields fail in cases where they worked before. It isn't possible to
create such fields using public APIs. The fix is trivial, so it seems
worth fixing this for custom m2m field users.

This is not a backport from master. Master has gotten enough other
changes to related fields internal API that this fix alone isn't enough
to do any good.
parent 9918b3f5

django/db/models/fields/related.py

+3 −1
Original line number Diff line number Diff line
@@ -544,12 +544,14 @@ def create_many_related_manager(superclass, rel): 
                                 "a many-to-many relationship can be used." %

                                 instance.__class__.__name__)





        def _get_fk_val(self, obj, field_name):

            """

            Returns the correct value for this relationship's foreign key. This

            might be something else than pk value when to_field is used.

            """

            if not self.through:

                # Make custom m2m fields with no through model defined usable.

                return obj.pk

            fk = self.through._meta.get_field(field_name)

            if fk.rel.field_name and fk.rel.field_name != fk.rel.to._meta.pk.attname:

                attname = fk.rel.get_related_field().get_attname()