Changeset 8469

Timestamp:

08/22/08 14:27:26 (11 months ago)

Author:

brosner

Message:

Fixed #7947 -- Handle the display of OneToOneField? in model forms correctly. Thanks tyson for the report and original patch.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (1 diff)
• django/trunk/django/db/models/fields/related.py (modified) (2 diffs)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (2 diffs)

django/trunk/django/contrib/admin/options.py

@@ -129 +129 @@
-            # Don't wrap raw_id fields. Their add function is in the popup window.
-            if not db_field.name in self.raw_id_fields:
-
+
+
+
+
-            return formfield
-

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

@@ -745 +745 @@
-    def __init__(self, to, to_field=None, **kwargs):
-        kwargs['unique'] = True
-        kwargs['editable'] = False
-        if 'num_in_admin' not in kwargs:
-            kwargs['num_in_admin'] = 0
@@ -755 +754 @@
-        if not cls._meta.one_to_one_field:
-            cls._meta.one_to_one_field = self
+    
+    def formfield(self, **kwargs):
+        if self.rel.parent_link:
+            return None
+        return super(OneToOneField, self).formfield(**kwargs)
-
-class ManyToManyField(RelatedField, Field):

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

@@ -54 +54 @@
-    def __unicode__(self):
-        return self.headline
+
+class ImprovedArticle(models.Model):
+    article = models.OneToOneField(Article)
+
+class ImprovedArticleWithParentLink(models.Model):
+    article = models.OneToOneField(Article, parent_link=True)
-
-class PhoneNumber(models.Model):
@@ -774 +780 @@
-[(1L, 'multicategory Entertainment'), (2L, "multicategory It's a test"), (3L, 'multicategory Third'), (4L, 'multicategory Fourth')]
-
+# OneToOneField ###############################################################
+
+>>> class ImprovedArticleForm(ModelForm):
+...     class Meta:
+...         model = ImprovedArticle
+>>> ImprovedArticleForm.base_fields.keys()
+['article']
+
+>>> class ImprovedArticleWithParentLinkForm(ModelForm):
+...     class Meta:
+...         model = ImprovedArticleWithParentLink
+>>> ImprovedArticleWithParentLinkForm.base_fields.keys()
+[]
+
-# PhoneNumberField ############################################################
-