Changeset 9326

Timestamp:

11/01/08 17:25:41 (2 months ago)

Author:

brosner

Message:

Fixed #9494 -- Ensure the foreign key in an inline formset is always present on the forms. Thanks Fugazi for the report.

Files:

• django/trunk/django/forms/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/model_formsets/models.py (modified) (1 diff)

django/trunk/django/forms/models.py

@@ -540 +540 @@
-    if fk.unique:
-        max_num = 1
+    if fields is not None:
+        fields = list(fields)
+        fields.append(fk.name)
+    else:
+        # get all the fields for this model that will be generated.
+        fields = fields_for_model(model, fields, exclude, formfield_callback).keys()
+        fields.append(fk.name)
-    kwargs = {
-        'form': form,

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

@@ -697 +697 @@
-[{'__all__': [u'Revision with this Repository and Revision already exists.']}]
-
+# unique_together with inlineformset_factory with overridden form fields
+# Also see #9494
+
+>>> FormSet = inlineformset_factory(Repository, Revision, fields=('revision',), extra=1)
+>>> data = {
+...     'revision_set-TOTAL_FORMS': '1',
+...     'revision_set-INITIAL_FORMS': '0',
+...     'revision_set-0-repository': repository.pk,
+...     'revision_set-0-revision': '146239817507f148d448db38840db7c3cbf47c76',
+...     'revision_set-0-DELETE': '',
+... }
+>>> formset = FormSet(data, instance=repository)
+>>> formset.is_valid()
+False
+
-# Use of callable defaults (see bug #7975).
-