Ticket #2145: djt-2145-one_to_one_field-contribution.diff

django/db/models/fields/related.py

@@ -613 +613 @@
         super(OneToOneField, self).contribute_to_class(cls, name)
         setattr(cls, self.name, ReverseSingleRelatedObjectDescriptor(self))
 
-    def contribute_to_related_class(self, cls, related):
-        setattr(cls, related.get_accessor_name(), SingleRelatedObjectDescriptor(related))
         if not cls._meta.one_to_one_field:
             cls._meta.one_to_one_field = self
 
+    def contribute_to_related_class(self, cls, related):
+        setattr(cls, related.get_accessor_name(), SingleRelatedObjectDescriptor(related))
+
+
     def formfield(self, **kwargs):
         defaults = {'form_class': forms.ModelChoiceField, 'queryset': self.rel.to._default_manager.all()}
         defaults.update(kwargs)