Changeset 8528

Timestamp:

08/24/08 22:51:25 (3 months ago)

Author:

brosner

Message:

Fixed #7888 -- Handle model inheritance with model formsets correctly. Thanks bpeschier for the report.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/django/forms/models.py (modified) (3 diffs)
• django/trunk/tests/modeltests/model_formsets/models.py (modified) (2 diffs)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (4 diffs)

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

@@ -98 +98 @@
-        self.db_column = db_column
-        self.db_tablespace = db_tablespace or settings.DEFAULT_INDEX_TABLESPACE
+        self.auto_created = auto_created
-
-        # Set db_index to True if the field has a relationship and doesn't explicitly set db_index.

django/trunk/django/forms/models.py

@@ -97 +97 @@
-    """
-    # avoid a circular import
-
+, OneToOneField
-    opts = instance._meta
-    data = {}
@@ -116 +116 @@
-                # MultipleChoiceWidget needs a list of pks, not object instances.
-                data[f.name] = [obj.pk for obj in f.value_from_object(instance)]
+        elif isinstance(f, OneToOneField):
+            data[f.attname] = f.value_from_object(instance)
-        else:
-            data[f.name] = f.value_from_object(instance)
@@ -318 +320 @@
-    def add_fields(self, form, index):
-        """Add a hidden field for the object's primary key."""
-has_auto_fiel
+pk.auto_create
-            self._pk_field_name = self.model._meta.pk.attname
-            form.fields[self._pk_field_name] = IntegerField(required=False, widget=HiddenInput)

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

@@ -14 +14 @@
-    def __unicode__(self):
-        return self.name
+
+class BetterAuthor(Author):
+    write_speed = models.IntegerField()
-
-class Book(models.Model):
@@ -230 +233 @@
-[[('id', 1), ('name', u'Charles Baudelaire')], [('id', 3), ('name', u'Paul Verlaine')], [('id', 2), ('name', u'Walt Whitman')]]
-
+# Model inheritance in model formsets ########################################
+
+>>> BetterAuthorFormSet = modelformset_factory(BetterAuthor)
+>>> formset = BetterAuthorFormSet()
+>>> for form in formset.forms:
+...     print form.as_p()
+<p><label for="id_form-0-name">Name:</label> <input id="id_form-0-name" type="text" name="form-0-name" maxlength="100" /></p>
+<p><label for="id_form-0-write_speed">Write speed:</label> <input type="text" name="form-0-write_speed" id="id_form-0-write_speed" /><input type="hidden" name="form-0-author_ptr_id" id="id_form-0-author_ptr_id" /></p>
+
+>>> data = {
+...     'form-TOTAL_FORMS': '1', # the number of forms rendered
+...     'form-INITIAL_FORMS': '0', # the number of forms with initial data
+...     'form-0-author_ptr_id': '',
+...     'form-0-name': 'Ernest Hemingway',
+...     'form-0-write_speed': '10',
+... }
+
+>>> formset = BetterAuthorFormSet(data)
+>>> formset.is_valid()
+True
+>>> formset.save()
+[<BetterAuthor: Ernest Hemingway>]
+
+>>> formset = BetterAuthorFormSet()
+>>> for form in formset.forms:
+...     print form.as_p()
+<p><label for="id_form-0-name">Name:</label> <input id="id_form-0-name" type="text" name="form-0-name" value="Ernest Hemingway" maxlength="100" /></p>
+<p><label for="id_form-0-write_speed">Write speed:</label> <input type="text" name="form-0-write_speed" value="10" id="id_form-0-write_speed" /><input type="hidden" name="form-0-author_ptr_id" value="4" id="id_form-0-author_ptr_id" /></p>
+<p><label for="id_form-1-name">Name:</label> <input id="id_form-1-name" type="text" name="form-1-name" maxlength="100" /></p>
+<p><label for="id_form-1-write_speed">Write speed:</label> <input type="text" name="form-1-write_speed" id="id_form-1-write_speed" /><input type="hidden" name="form-1-author_ptr_id" id="id_form-1-author_ptr_id" /></p>
+
+>>> data = {
+...     'form-TOTAL_FORMS': '2', # the number of forms rendered
+...     'form-INITIAL_FORMS': '1', # the number of forms with initial data
+...     'form-0-author_ptr_id': '4',
+...     'form-0-name': 'Ernest Hemingway',
+...     'form-0-write_speed': '10',
+...     'form-1-author_ptr_id': '',
+...     'form-1-name': '',
+...     'form-1-write_speed': '',
+... }
+
+>>> formset = BetterAuthorFormSet(data)
+>>> formset.is_valid()
+True
+>>> formset.save()
+[]
-
-# Inline Formsets ############################################################

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

@@ -13 +13 @@
-from django.db import models
-from django.core.files.storage import FileSystemStorage
+
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
-
-temp_storage = FileSystemStorage(tempfile.gettempdir())
@@ -60 +66 @@
-class ImprovedArticleWithParentLink(models.Model):
-    article = models.OneToOneField(Article, parent_link=True)
+
+class BetterWriter(Writer):
+    pass
-
-class PhoneNumber(models.Model):
@@ -92 +101 @@
-__test__ = {'API_TESTS': """
->>> from django import forms
-
+, model_to_dict
->>> from django.core.files.uploadedfile import SimpleUploadedFile
-
@@ -794 +803 @@
-[]
-
+>>> bw = BetterWriter(name=u'Joe Better')
+>>> bw.save()
+>>> sorted(model_to_dict(bw).keys())
+['id', 'name', 'writer_ptr_id']
+
-# PhoneNumberField ############################################################
-