Ticket #16115: new_hook_save_model_and_relations.diff

django/contrib/admin/options.py

@@ -683 +683 @@
         """
         formset.save()
 
+    def save_model_and_relations(self, request, obj, form, formsets, change):
+        """
+        Given a model instance, a bound form and a list of inline formsets
+        save everything in to the database. 
+
+        At this point save_form() has already been called, so just 
+        form.save_m2m() needs to be called.
+        """
+        self.save_model(request, new_object, form, change=change)
+        form.save_m2m()
+        for formset in formsets:
+            self.save_formset(request, form, formset, change=change)
+
     def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
         opts = self.model._meta
         app_label = opts.app_label
@@ -886 +899 @@
                                   prefix=prefix, queryset=inline.queryset(request))
                 formsets.append(formset)
             if all_valid(formsets) and form_validated:
-                self.save_model(request, new_object, form, change=False)
-                form.save_m2m()
-                for formset in formsets:
-                    self.save_formset(request, form, formset, change=False)
+                self.save_model_and_relations(request, new_object, form, formset, change=False)
 
                 self.log_addition(request, new_object)
                 return self.response_add(request, new_object)
@@ -988 +998 @@
                 formsets.append(formset)
 
             if all_valid(formsets) and form_validated:
-                self.save_model(request, new_object, form, change=True)
-                form.save_m2m()
-                for formset in formsets:
-                    self.save_formset(request, form, formset, change=True)
+                self.save_model_and_relations(request, new_object, form, formset, change=True)
 
                 change_message = self.construct_change_message(request, form, formsets)
                 self.log_change(request, new_object, change_message)