diff options
| author | Loic Bistuer <loic.bistuer@gmail.com> | 2014-03-28 21:42:58 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-03-31 07:19:59 -0400 |
| commit | 4339e9a92d98371a50a6fe54ab7ea0c602ecee28 (patch) | |
| tree | 9e0c76d4191bb8731b20e3ec86c1f06ddd3f2921 /django | |
| parent | d57ba04d890bab2d5ebe494e5e23d7374d658036 (diff) | |
Fixed #21795 -- Made add_preserved_filters account for url prefixes.
Thanks to trac username honyczek for the report. Refs #6903.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/templatetags/admin_urls.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/admin/templatetags/admin_urls.py b/django/contrib/admin/templatetags/admin_urls.py index 68c7083ecf..350057a117 100644 --- a/django/contrib/admin/templatetags/admin_urls.py +++ b/django/contrib/admin/templatetags/admin_urls.py @@ -5,7 +5,7 @@ except ImportError: from django import template from django.contrib.admin.utils import quote -from django.core.urlresolvers import resolve, Resolver404 +from django.core.urlresolvers import Resolver404, get_script_prefix, resolve from django.utils.http import urlencode register = template.Library() @@ -33,8 +33,9 @@ def add_preserved_filters(context, url, popup=False, to_field=None): if opts and preserved_filters: preserved_filters = dict(parse_qsl(preserved_filters)) + match_url = '/%s' % url.partition(get_script_prefix())[2] try: - match = resolve(url) + match = resolve(match_url) except Resolver404: pass else: |