Changeset 8708

Timestamp:

08/29/08 12:41:40 (3 months ago)

Author:

brosner

Message:

Fixed #7918 -- Allow the foreign key in an inline to be any where in the parent chain. Thanks sil for the report.

Files:

• django/trunk/django/forms/models.py (modified) (2 diffs)
• django/trunk/tests/modeltests/model_formsets/models.py (modified) (2 diffs)

django/trunk/django/forms/models.py

@@ -386 +386 @@
-            if not isinstance(fk, ForeignKey) or \
-                    (fk.rel.to != parent_model and
-parents.keys
+get_parent_list
-                raise Exception("fk_name '%s' is not a ForeignKey to %s" % (fk_name, parent_model))
-        elif len(fks_to_parent) == 0:
@@ -396 +396 @@
-            if isinstance(f, ForeignKey)
-            and (f.rel.to == parent_model
-parents.keys
+get_parent_list
-        ]
-        if len(fks_to_parent) == 1:

django/trunk/tests/modeltests/model_formsets/models.py

@@ -36 +36 @@
-    my_pk = models.CharField(max_length=10, primary_key=True)
-    some_field = models.CharField(max_length=100)
+
+
+# models for inheritance tests.
+
+class Place(models.Model):
+    name = models.CharField(max_length=50)
+    city = models.CharField(max_length=50)
+    
+    def __unicode__(self):
+        return self.name
+
+class Owner(models.Model):
+    name = models.CharField(max_length=100)
+    place = models.ForeignKey(Place)
+
+class Restaurant(Place):
+    serves_pizza = models.BooleanField()
+    
+    def __unicode__(self):
+        return self.name
+
+class MexicanRestaurant(Restaurant):
+    serves_tacos = models.BooleanField()
-
-
@@ -397 +420 @@
-<p><label for="id_form-0-some_field">Some field:</label> <input id="id_form-0-some_field" type="text" name="form-0-some_field" maxlength="100" /></p>
-
+# Foreign keys in parents ########################################
+
+>>> from django.forms.models import _get_foreign_key
+
+>>> type(_get_foreign_key(Restaurant, Owner))
+<class 'django.db.models.fields.related.ForeignKey'>
+>>> type(_get_foreign_key(MexicanRestaurant, Owner))
+<class 'django.db.models.fields.related.ForeignKey'>
+
-"""}