Index: django/django/contrib/admin/options.py
===================================================================
--- django/django/contrib/admin/options.py (revision 12351)
+++ django/django/contrib/admin/options.py (working copy)
@@ -16,6 +16,7 @@
from django.utils.datastructures import SortedDict
from django.utils.functional import update_wrapper
from django.utils.html import escape
+from django.utils.http import urlquote
from django.utils.safestring import mark_safe
from django.utils.functional import curry
from django.utils.text import capfirst, get_text_list
@@ -31,6 +32,10 @@
# returns the
class for a given radio_admin field
get_ul_class = lambda x: 'radiolist%s' % ((x == HORIZONTAL) and ' inline' or '')
+# GET parameter for the URL to return to after change/add views. This lets the
+# admin save the state of the changelist page through the change/add page.
+RETURN_GET_PARAM = '_return_to'
+
class IncorrectLookupParameters(Exception):
pass
@@ -638,28 +643,41 @@
pk_value = obj._get_pk_val()
msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj)}
- # Here, we distinguish between different save types by checking for
+
+ # Below, we distinguish between different save types by checking for
# the presence of keys in request.POST.
+
+ # The user clicked "save and continue editing". Redirect to admin URL
+ # for this object, possibly in popup mode if needed.
if request.POST.has_key("_continue"):
self.message_user(request, msg + ' ' + _("You may edit it again below."))
if request.POST.has_key("_popup"):
post_url_continue += "?_popup=1"
return HttpResponseRedirect(post_url_continue % pk_value)
+ # This was a popup and the user clicked the simple "save" button.
+ # Return a little script which populates the calling page with the
+ # saved key.
if request.POST.has_key("_popup"):
return HttpResponse('' % \
# escape() calls force_unicode.
(escape(pk_value), escape(obj)))
+
+ # The user clicked "save and add another", so redirect back to the bare
+ # "add" page, which will be request.path.
elif request.POST.has_key("_addanother"):
self.message_user(request, msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name)))
return HttpResponseRedirect(request.path)
+
+ # Just a regular "save" click. IF we've been pased an explicit return
+ # URL in GET, go there. Otherwise, redirect to the plain changelist.
+ # If the user doesn't have changelist permission, just redirect back
+ # to the main admin index.
else:
self.message_user(request, msg)
-
- # 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 RETURN_GET_PARAM in request.GET:
+ post_url = request.GET[RETURN_GET_PARAM]
+ elif self.has_change_permission(request, None):
post_url = '../'
else:
post_url = '../../../'
@@ -673,22 +691,33 @@
pk_value = obj._get_pk_val()
msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj)}
+
+ # Similar redirecting logic to response_add, above.
+
+ # "Save and continue editing"
if request.POST.has_key("_continue"):
self.message_user(request, msg + ' ' + _("You may edit it again below."))
if request.REQUEST.has_key('_popup'):
return HttpResponseRedirect(request.path + "?_popup=1")
else:
return HttpResponseRedirect(request.path)
+
+ # "Save as a new object"
elif request.POST.has_key("_saveasnew"):
msg = _('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': force_unicode(opts.verbose_name), 'obj': obj}
self.message_user(request, msg)
return HttpResponseRedirect("../%s/" % pk_value)
+
+ # "Save and add another"
elif request.POST.has_key("_addanother"):
self.message_user(request, msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name)))
return HttpResponseRedirect("../add/")
+
+ # "Save"
else:
self.message_user(request, msg)
- return HttpResponseRedirect("../")
+ post_url = request.GET.get(RETURN_GET_PARAM, '../')
+ return HttpResponseRedirect(post_url)
def response_action(self, request, queryset):
"""
@@ -766,6 +795,7 @@
ModelForm = self.get_form(request)
formsets = []
+ return_to = request.GET.get(RETURN_GET_PARAM, None)
if request.method == 'POST':
form = ModelForm(request.POST, request.FILES)
if form.is_valid():
@@ -816,6 +846,9 @@
queryset=inline.queryset(request))
formsets.append(formset)
+ if return_to:
+ form_url = form_url + '?%s=%s' % (RETURN_GET_PARAM, urlquote(return_to))
+
adminForm = helpers.AdminForm(form, list(self.get_fieldsets(request)),
self.prepopulated_fields, self.get_readonly_fields(request),
model_admin=self)
@@ -864,6 +897,7 @@
ModelForm = self.get_form(request, obj)
formsets = []
+ return_to = request.GET.get(RETURN_GET_PARAM, None)
if request.method == 'POST':
form = ModelForm(request.POST, request.FILES, instance=obj)
if form.is_valid():
@@ -907,6 +941,11 @@
queryset=inline.queryset(request))
formsets.append(formset)
+ if return_to:
+ form_url = '?%s=%s' % (RETURN_GET_PARAM, urlquote(return_to))
+ else:
+ form_url = ''
+
adminForm = helpers.AdminForm(form, self.get_fieldsets(request, obj),
self.prepopulated_fields, self.get_readonly_fields(request, obj),
model_admin=self)
@@ -934,7 +973,7 @@
'app_label': opts.app_label,
}
context.update(extra_context or {})
- return self.render_change_form(request, context, change=True, obj=obj)
+ return self.render_change_form(request, context, change=True, form_url=form_url, obj=obj)
@csrf_protect
def changelist_view(self, request, extra_context=None):
Index: django/django/contrib/admin/views/main.py
===================================================================
--- django/django/contrib/admin/views/main.py (revision 12351)
+++ django/django/contrib/admin/views/main.py (working copy)
@@ -1,12 +1,12 @@
from django.contrib.admin.filterspecs import FilterSpec
-from django.contrib.admin.options import IncorrectLookupParameters
+from django.contrib.admin.options import IncorrectLookupParameters, RETURN_GET_PARAM
from django.contrib.admin.util import quote
from django.core.paginator import Paginator, InvalidPage
from django.db import models
from django.db.models.query import QuerySet
from django.utils.encoding import force_unicode, smart_str
from django.utils.translation import ugettext
-from django.utils.http import urlencode
+from django.utils.http import urlencode, urlquote
import operator
try:
@@ -70,6 +70,7 @@
self.title = (self.is_popup and ugettext('Select %s') % force_unicode(self.opts.verbose_name) or ugettext('Select %s to change') % force_unicode(self.opts.verbose_name))
self.filter_specs, self.has_filters = self.get_filters(request)
self.pk_attname = self.lookup_opts.pk.attname
+ self.this_clist_url = request.get_full_path()
def get_filters(self, request):
filter_specs = []
@@ -240,4 +241,4 @@
return qs
def url_for_result(self, result):
- return "%s/" % quote(getattr(result, self.pk_attname))
+ return "%s/?%s=%s" % (quote(getattr(result, self.pk_attname)), RETURN_GET_PARAM, urlquote(self.this_clist_url))
Index: django/tests/regressiontests/admin_views/tests.py
===================================================================
--- django/tests/regressiontests/admin_views/tests.py (revision 12351)
+++ django/tests/regressiontests/admin_views/tests.py (working copy)
@@ -14,6 +14,7 @@
from django.utils import formats
from django.utils.cache import get_max_age
from django.utils.html import escape
+from django.utils.http import urlquote
from django.utils.translation import get_date_formats
# local test models
@@ -25,7 +26,7 @@
class AdminViewBasicTest(TestCase):
- fixtures = ['admin-views-users.xml', 'admin-views-colors.xml', 'admin-views-fabrics.xml']
+ fixtures = ['admin-views-users.xml', 'admin-views-colors.xml', 'admin-views-fabrics.xml', 'admin-views-things.xml']
# Store the bit of the URL where the admin is registered as a class
# variable. That way we can test a second AdminSite just by subclassing
@@ -213,6 +214,58 @@
response = self.client.get('/test_admin/%s/admin_views/thing/' % self.urlbit, {'color__id__exact': 'StringNotInteger!'})
self.assertRedirects(response, '/test_admin/%s/admin_views/thing/?e=1' % self.urlbit)
+ def testFilterPreservedChangeListLinks(self):
+ """Link to model changeform in changelist should contain filter-preserving GET data if a filter is active"""
+ changelist_url = '/test_admin/%s/admin_views/thing/' % self.urlbit
+ filter_spec = '?color__id__exact=1'
+ should_contain = """Ball |
""" % (changelist_url, urlquote(filter_spec))
+ # get the changelist page with one active filter
+ response = self.client.get(changelist_url, {'color__id__exact': 1})
+ # links in the changelist table should preserve the filter
+ self.failUnlessEqual(response.status_code, 200)
+ self.assertContains(response, should_contain)
+
+ def testFilterPreservedEditForm(self):
+ """Model changeform post handler URL should contain filter specified when clicking the changelist link."""
+ changelist_url = '/test_admin/%s/admin_views/thing/' % self.urlbit
+ filter_spec = '?color__id__exact=1'
+ edit_form_url = '%s1/?_return_to=%s%s' % (changelist_url, changelist_url, urlquote(filter_spec))
+ should_contain = '