Ticket #8241: onetoone_admin.8461.diff

django/forms/models.py

@@ -28 +28 @@
     If commit=True, then the changes to ``instance`` will be saved to the
     database. Returns ``instance``.
     """
-    from django.db import models
+    from django.db.models import AutoField, OneToOneField
     opts = instance._meta
     if form.errors:
         raise ValueError("The %s could not be %s because the data didn't"
                          " validate." % (opts.object_name, fail_message))
     cleaned_data = form.cleaned_data
     for f in opts.fields:
-        if not f.editable or isinstance(f, models.AutoField) \
+        if not f.editable or isinstance(f, (AutoField, OneToOneField)) \
                 or not f.name in cleaned_data:
             continue
         if fields and f.name not in fields:
@@ -289 +289 @@
             existing_objects[obj.pk] = obj
         saved_instances = []
         for form in self.initial_forms:
-            obj = existing_objects[form.cleaned_data[self.model._meta.pk.attname]]
+            obj = existing_objects[form.cleaned_data[self._pk_field_name]]
             if self.can_delete and form.cleaned_data[DELETION_FIELD_NAME]:
                 self.deleted_objects.append(obj)
                 obj.delete()
@@ -317 +317 @@
 
     def add_fields(self, form, index):
         """Add a hidden field for the object's primary key."""
-        if self.model._meta.has_auto_field:
-            self._pk_field_name = self.model._meta.pk.attname
+        from django.db.models import AutoField, OneToOneField
+        pk = self.model._meta.pk
+        while isinstance(pk, OneToOneField):
+            pk = pk.rel.to._meta.pk # Drill down until we find a "real" pk
+        if isinstance(pk, AutoField):
+            self._pk_field_name = self.model._meta.pk.name
             form.fields[self._pk_field_name] = IntegerField(required=False, widget=HiddenInput)
         super(BaseModelFormSet, self).add_fields(form, index)
 

django/db/models/fields/related.py

@@ -744 +744 @@
     """
     def __init__(self, to, to_field=None, **kwargs):
         kwargs['unique'] = True
-        kwargs['editable'] = False
+        if not kwargs.get('primary_key', False):
+            kwargs['editable'] = False
         if 'num_in_admin' not in kwargs:
             kwargs['num_in_admin'] = 0
         super(OneToOneField, self).__init__(to, to_field, OneToOneRel, **kwargs)