Ticket #6903: 6903.r16617.diff

django/contrib/admin/options.py

@@ -813 +820 @@
             # Figure out where to redirect. If the user has change permission,
             # redirect to the change-list page for this object. Otherwise,
             # redirect to the admin index.
-            if self.has_change_permission(request, None):
+            if self.has_change_permission(request, None) and 'HTTP_REFERER' in request.POST:
+                return HttpResponseRedirect(request.POST['HTTP_REFERER'])
+            elif self.has_change_permission(request, None):
                 return HttpResponseRedirect('../')
             else:
                 return HttpResponseRedirect('../../../')
@@ -979 +988 @@
         "The 'change' admin view for this model."
         model = self.model
         opts = model._meta
+        HTTP_REFERER = None
 
         obj = self.get_object(request, unquote(object_id))
 
@@ -1033 +1043 @@
                                   queryset=inline.queryset(request))
                 formsets.append(formset)
 
+            if 'HTTP_REFERER' in request.META:
+                HTTP_REFERER = request.META['HTTP_REFERER']
+
         adminForm = helpers.AdminForm(form, self.get_fieldsets(request, obj),
             self.get_prepopulated_fields(request, obj),
             self.get_readonly_fields(request, obj),
@@ -1059 +1072 @@
             'inline_admin_formsets': inline_admin_formsets,
             'errors': helpers.AdminErrorList(form, formsets),
             'app_label': opts.app_label,
+            'HTTP_REFERER': HTTP_REFERER,
         }
         context.update(extra_context or {})
         return self.render_change_form(request, context, change=True, obj=obj)

django/contrib/admin/templates/admin/change_form.html

@@ -37 +37 @@
 <form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
 <div>
 {% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
+{% if HTTP_REFERER %}<input type="hidden" name="HTTP_REFERER" value="{{ HTTP_REFERER }}" />{% endif %}
 {% if save_on_top %}{% submit_row %}{% endif %}
 {% if errors %}
     <p class="errornote">