Changeset 8179

Timestamp:

08/01/08 15:35:40 (4 months ago)

Author:

brosner

Message:

Ensure that custom primary keys are always shown on a formset. Refs #7938. Thanks magneto for discovering this problem.

Files:

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

django/trunk/django/forms/models.py

@@ -379 +379 @@
-    def add_fields(self, form, index):
-        """Add a hidden field for the object's primary key."""
-
-
+
+
+
-        super(BaseModelFormSet, self).add_fields(form, index)
-

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

@@ -29 +29 @@
-    def __unicode__(self):
-        return self.name
+
+class CustomPrimaryKey(models.Model):
+    my_pk = models.CharField(max_length=10, primary_key=True)
+    some_field = models.CharField(max_length=100)
-
-
@@ -331 +335 @@
-<p><label for="id_test-1-title">Title:</label> <input id="id_test-1-title" type="text" name="test-1-title" maxlength="100" /><input type="hidden" name="test-1-id" id="id_test-1-id" /></p>
-
+# Test a custom primary key ###################################################
+
+We need to ensure that it is displayed
+
+>>> CustomPrimaryKeyFormSet = modelformset_factory(CustomPrimaryKey)
+>>> formset = CustomPrimaryKeyFormSet()
+>>> for form in formset.forms:
+...     print form.as_p()
+<p><label for="id_form-0-my_pk">My pk:</label> <input id="id_form-0-my_pk" type="text" name="form-0-my_pk" maxlength="10" /></p>
+<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>
-
-"""}