Changeset 7331

Timestamp:

03/20/08 01:56:23 (4 months ago)

Author:

mtredinnick

Message:

Fixed #6445 -- Allow model instances to be used as a default for ForeignKeys?
(via a callable). Also updates the documentation of the "default" attribute to
indicate a callable can be used. Thanks, Philipe Raoult.

Files:

• django/trunk/django/db/models/fields/related.py (modified) (1 diff)
• django/trunk/docs/model-api.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/model_fields/models.py (modified) (1 diff)

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

@@ -549 +549 @@
-        return field_objs, params
-
+    def get_default(self):
+        "Here we check if the default value is an object and return the to_field if so."
+        field_default = super(ForeignKey, self).get_default()
+        if isinstance(field_default, self.rel.to):
+            return getattr(field_default, self.rel.get_related_field().attname)
+        return field_default
+
-    def get_manipulator_field_objs(self):
-        rel_field = self.rel.get_related_field()

django/trunk/docs/model-api.txt

@@ -627 +627 @@
-~~~~~~~~~~~
-
-
+
+
-
-``editable``

django/trunk/tests/regressiontests/model_fields/models.py

@@ +1 @@
+
+from django.db import models
+
+class Foo(models.Model):
+    a = models.CharField(max_length=10)
+
+def get_foo():
+    return Foo.objects.get(id=1)
+
+class Bar(models.Model):
+    b = models.CharField(max_length=10)
+    a = models.ForeignKey(Foo, default=get_foo)
+
+__test__ = {'API_TESTS':"""
+# Create a couple of Places.
+>>> f = Foo.objects.create(a='abc')
+>>> f.id
+1
+>>> b = Bar(b = "bcd")
+>>> b.a
+<Foo: Foo object>
+>>> b.save()
+
+"""}