Ticket #8005: 8005.2.diff

django/contrib/admin/options.py

@@ -324 +324 @@
     def get_formsets(self, request, obj=None):
         for inline in self.inline_instances:
             yield inline.get_formset(request, obj)
-
+    
+    def save_formset_add(self, request, formset, new_object):
+        # 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()
+    
+    def save_model_add(self, request, form, formsets):
+        return form.save(commit=True)
+    
     def save_add(self, request, form, formsets, post_url_continue):
         """
         Saves the object in the "add" stage and returns an HttpResponseRedirect.
@@ -333 +342 @@
         """
         from django.contrib.admin.models import LogEntry, ADDITION
         opts = self.model._meta
-        new_object = form.save(commit=True)
-
+        
+        new_object = self.save_model_add(request, form, formsets)
+        
         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()
-
+                self.save_formset_add(request, formset, new_object)
+        
         pk_value = new_object._get_pk_val()
         LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), ADDITION)
         msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': opts.verbose_name, 'obj': new_object}
@@ -371 +378 @@
                 post_url = '../../../'
             return HttpResponseRedirect(post_url)
     save_add = transaction.commit_on_success(save_add)
-
+    
+    def save_formset_change(self, request, formset, new_object):
+        formset.save()
+    
+    def save_model_change(self, request, form, formsets):
+        return form.save(commit=True)
+    
     def save_change(self, request, form, formsets=None):
         """
         Saves the object in the "change" stage and returns an HttpResponseRedirect.
@@ -382 +395 @@
         """
         from django.contrib.admin.models import LogEntry, CHANGE
         opts = self.model._meta
-        new_object = form.save(commit=True)
-        pk_value = new_object._get_pk_val()
-
+        
+        new_object = self.save_model_change(request, form, formsets)
+        
         if formsets:
             for formset in formsets:
-                formset.save()
-
+                self.save_formset_change(self, request, formset, new_object)
+        
+        pk_value = new_object._get_pk_val()
+        
         # Construct the change message.
         change_message = []
         if form.changed_data: