From e508bfd27f34fc753ae32cc1776251e2d7f36610 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Thu, 14 May 2009 02:23:53 +0000 Subject: Fixed #10992: fixed a bug saving inlines with custom primary key fields. Thanks, Zain. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10777 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/forms/models.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'django/forms') diff --git a/django/forms/models.py b/django/forms/models.py index 705ef10f17..351234a433 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -612,7 +612,12 @@ class BaseModelFormSet(BaseFormSet): for form in self.initial_forms: pk_name = self._pk_field.name raw_pk_value = form._raw_value(pk_name) - pk_value = form.fields[pk_name].clean(raw_pk_value).pk + + # clean() for different types of PK fields can sometimes return + # the model instance, and sometimes the PK. Handle either. + pk_value = form.fields[pk_name].clean(raw_pk_value) + pk_value = getattr(pk_value, 'pk', pk_value) + obj = existing_objects[pk_value] if self.can_delete: raw_delete_value = form._raw_value(DELETION_FIELD_NAME) -- cgit v1.3