Ticket #6406: form_save_hooks.diff

django/contrib/admin/options.py

@@ -329 +329 @@
         from django.contrib.admin.models import LogEntry, ADDITION
         from django.contrib.contenttypes.models import ContentType
         opts = model._meta
-        new_object = form.save(commit=True)
-
-        if formsets:
-            for formset in formsets:
-                # HACK: it seems like the parent obejct should be passed into
-                # a method of something, not just set as an attribute
-                formset.instance = new_object
-                formset.save()
+        new_object = self.save_add_form(request=request, model=model, form=form, formsets=formsets)
 
         pk_value = new_object._get_pk_val()
         LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, force_unicode(new_object), ADDITION)
@@ -378 +371 @@
         from django.contrib.admin.models import LogEntry, CHANGE
         from django.contrib.contenttypes.models import ContentType
         opts = model._meta
-        new_object = form.save(commit=True)
+        new_object = self.save_change_form(request=request, model=model, form=form, formsets=formsets)
         pk_value = new_object._get_pk_val()
 
-        if formsets:
-            for formset in formsets:
-                formset.save()
 
         # Construct the change message. TODO: Temporarily commented-out,
         # as manipulator object doesn't exist anymore, and we don't yet
@@ -417 +407 @@
             request.user.message_set.create(message=msg)
             return HttpResponseRedirect("../")
     save_change = transaction.commit_on_success(save_change)
+    
+    def save_add_form(self, request, model, form, formsets):
+        new_object = form.save(commit=True)
+        
+        if formsets:
+            for formset in formsets:
+                formset.instance = new_object
+                formset.save()
+        
+        return new_object
+        
+    def save_change_form(self, request, model, form, formsets):
+        new_object = form.save(commit=True)
+        
+        if formsets:
+            for formset in formsets:
+                formset.save()
+        
+        return new_object
 
     def render_change_form(self, request, model, context, add=False, change=False, form_url='', obj=None):
         opts = model._meta