Ticket #4507: model-admin-save-hooks.diff

django/contrib/admin/options.py

@@ -318 +318 @@
         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.form_save_add(request, model, form, formsets)
 
         pk_value = new_object._get_pk_val()
         LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, str(new_object), ADDITION)
@@ -367 +361 @@
         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.form_save_change(request, model, form, 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
         # have a way to get fields_added, fields_changed, fields_deleted.
@@ -406 +398 @@
             request.user.message_set.create(message=msg)
             return HttpResponseRedirect("../")
 
+    def form_save_add(self, request, model, form, formsets, commit=True):
+        return self.form_save(request, model, form, formsets, commit, True)
+
+    def form_save_change(self, request, model, form, formsets, commit=True):
+        return self.form_save(request, model, form, formsets, commit, False)
+
+    def form_save(self, request, model, form, formsets, commit, add):
+        object = form.save(commit=commit)
+        if formsets:
+            for formset in formsets:
+                if add:
+                    # HACK: it seems like the parent object should be passed
+                    # into a method of something, not just set as an attribute
+                    formset.instance = object
+                formset.save()
+        return object
+
     def add_view(self, request, form_url=''):
         "The 'add' admin view for this model."
         from django.contrib.admin.views.main import render_change_form