From aaad3e27ac7cfcbbfeac6353d17d27e8da523cc8 Mon Sep 17 00:00:00 2001 From: Akis Kesoglou Date: Fri, 7 Mar 2014 13:56:28 +0200 Subject: Fixed #22217 - ManyToManyField.through_fields fixes. - Docs description of arguments mix up. - Keep it from erroneously masking E332 check. - Add checks E338 and E339, tweak message of E337. --- docs/ref/checks.txt | 4 +++- docs/ref/models/fields.txt | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'docs/ref') diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt index f7c2e721cb..98a6e00e73 100644 --- a/docs/ref/checks.txt +++ b/docs/ref/checks.txt @@ -94,7 +94,9 @@ Related Fields * **fields.E334**: The model is used as an intermediate model by ````, but it has more than one foreign key from ````, which is ambiguous. You must specify which foreign key Django should use via the through_fields keyword argument. * **fields.E335**: The model is used as an intermediate model by ````, but it has more than one foreign key to ````, which is ambiguous. You must specify which foreign key Django should use via the through_fields keyword argument. * **fields.E336**: The model is used as an intermediary model by ````, but it does not have foreign key to ```` or ````. -* **fields.E337**: The field is given an iterable for through_fields, which does not provide the names for both link fields that Django should use for the relation through . +* **fields.E337**: Field specifies ``through_fields`` but does not provide the names of the two link fields that should be used for the relation through ````. +* **fields.E338**: The intermediary model ```` has no field ````. +* **fields.E339**: ``.`` is not a foreign key to ````. Signals ~~~~~~~ diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index ab24dd7e66..39af0c64b0 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -1353,11 +1353,11 @@ that control how the relationship functions. class Group(models.Model): name = models.CharField(max_length=128) - members = models.ManyToManyField(Person, through='Membership', through_fields=('person', 'group')) + members = models.ManyToManyField(Person, through='Membership', through_fields=('group', 'person')) class Membership(models.Model): - person = models.ForeignKey(Person) group = models.ForeignKey(Group) + person = models.ForeignKey(Person) inviter = models.ForeignKey(Person, related_name="membership_invites") invite_reason = models.CharField(max_length=64) @@ -1368,9 +1368,10 @@ that control how the relationship functions. above. ``through_fields`` accepts a 2-tuple ``('field1', 'field2')``, where - ``field1`` is the name of the foreign key to the target model (``person`` - in this case), and ``field2`` the name of the foreign key to the model the - :class:`ManyToManyField` is defined on (``group`` in this case). + ``field1`` is the name of the foreign key to the model the + :class:`ManyToManyField` is defined on (``group`` in this case), and + ``field2`` the name of the foreign key to the target model (``person`` + in this case). When you have more than one foreign key on an intermediary model to any (or even both) of the models participating in a many-to-many relationship, -- cgit v1.3