Changeset 8721

Timestamp:

08/29/08 16:24:00 (3 months ago)

Author:

mtredinnick

Message:

Fixed #8279 -- Multiple many-to-many relations to "self" are now possible.

Files:

• django/trunk/django/db/models/fields/related.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/m2m_regress (added)
• django/trunk/tests/regressiontests/m2m_regress/__init__.py (added)
• django/trunk/tests/regressiontests/m2m_regress/models.py (added)

django/trunk/django/db/models/fields/related.py

@@ -717 +717 @@
-        if not cls._meta.one_to_one_field:
-            cls._meta.one_to_one_field = self
-
+
-    def formfield(self, **kwargs):
-        if self.rel.parent_link:
@@ -845 +845 @@
-
-    def contribute_to_class(self, cls, name):
+        # To support multiple relations to self, it's useful to have a non-None
+        # related name on symmetrical relations for internal reasons. The
+        # concept doesn't make a lot of sense externally ("you want me to
+        # specify *what* on my non-reversible relation?!"), so we set it up
+        # automatically. The funky name reduces the chance of an accidental
+        # clash.
+        if self.rel.symmetrical and self.rel.related_name is None:
+            self.rel.related_name = "%s_rel_+" % name
+
-        super(ManyToManyField, self).contribute_to_class(cls, name)
-        # Add the descriptor for the m2m relation