Ticket #10992: 10992_fix.diff

django/forms/models.py

@@ -604 +603 @@
         if not self.get_queryset():
             return []
 
-        # Put the objects from self.get_queryset into a dict so they are easy to lookup by pk
-        existing_objects = {}
-        for obj in self.get_queryset():
-            existing_objects[obj.pk] = obj
         saved_instances = []
         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
-            obj = existing_objects[pk_value]
+            clean_data = form.fields[pk_name].clean(raw_pk_value)
+            
+            if isinstance(form.fields[pk_name], ModelChoiceField):
+                # the PK field is the default implicit PK field (ModelChoiceField), and
+                # ModelChoiceField.clean() returns an object, not a raw primary key value
+                clean_pk = clean_data.pk
+            else:
+                # the PK field is of another type, like CharField or FloatField
+                clean_pk = clean_data
+            
+            obj = self.get_queryset().get(pk=clean_pk)
+
             if self.can_delete:
                 raw_delete_value = form._raw_value(DELETION_FIELD_NAME)
                 should_delete = form.fields[DELETION_FIELD_NAME].clean(raw_delete_value)