Ticket #6406: admin_options.diff

contrib/admin/options.py

@@ -353 +353 @@
         for inline in self.inline_instances:
             yield inline.get_formset(request, obj)
 
+    def _save_form(self, request, model, form, commit=True) :
+        return form.save(commit=commit)
+
+    def _save_formset(self, request, model, formset) :
+        return formset.save()
+
     def save_add(self, request, model, form, formsets, post_url_continue):
         """
         Saves the object in the "add" stage and returns an HttpResponseRedirect.
@@ -362 +368 @@
         from django.contrib.admin.models import LogEntry, ADDITION
         from django.contrib.contenttypes.models import ContentType
         opts = model._meta
-        new_object = form.save(commit=True)
+        new_object = self._save_form(request, model, form, 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()
+                self._save_formset(request, model, form)
 
         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)
@@ -412 +418 @@
         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_form(request, model, form, commit=True)
         pk_value = new_object._get_pk_val()
 
         if formsets:
             for formset in formsets:
-                formset.save()
+                self._save_formset(request, model, form)
 
         # Construct the change message.                 
         change_message = []