diff options
| author | Brian Rosner <brosner@gmail.com> | 2008-08-01 20:35:40 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2008-08-01 20:35:40 +0000 |
| commit | af35fb1fbb48e6125b313ad35238cd06fa3ce7b5 (patch) | |
| tree | 583f3e804a44114a32f5fbdd25daf9772e720553 /django | |
| parent | 61b335700ca89bbabc25fecd0df476dcae9a4309 (diff) | |
Ensure that custom primary keys are always shown on a formset. Refs #7938. Thanks magneto for discovering this problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/forms/models.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/forms/models.py b/django/forms/models.py index 134746f4fc..1f807f2b42 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -378,8 +378,9 @@ class BaseModelFormSet(BaseFormSet): def add_fields(self, form, index): """Add a hidden field for the object's primary key.""" - self._pk_field_name = self.model._meta.pk.attname - form.fields[self._pk_field_name] = IntegerField(required=False, widget=HiddenInput) + if self.model._meta.has_auto_field: + self._pk_field_name = self.model._meta.pk.attname + form.fields[self._pk_field_name] = IntegerField(required=False, widget=HiddenInput) super(BaseModelFormSet, self).add_fields(form, index) def modelformset_factory(model, form=ModelForm, formfield_callback=lambda f: f.formfield(), |