Ticket #30407: modelform_reverse_initial.diff

django/forms/models.py

@@ -281 +281 @@
         opts = self._meta
         if opts.model is None:
             raise ValueError('ModelForm has no model class specified.')
+
+        object_data = {}
+
+        if initial is not None:
+            object_data.update(initial)
+
         if instance is None:
             # if we didn't get an instance, instantiate a new one
             self.instance = opts.model()
-            object_data = {}
         else:
             self.instance = instance
-            object_data = model_to_dict(instance, opts.fields, opts.exclude)
-        # if initial was provided, it should override the values from instance
-        if initial is not None:
-            object_data.update(initial)
+            object_data.update(model_to_dict(instance, opts.fields, opts.exclude))
+
         # self._validate_unique will be set to True by BaseModelForm.clean().
         # It is False by default so overriding self.clean() and failing to call
         # super will stop validate_unique from being called.