p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #16842 -- Modified the RedirectView to correctly handle query strings with percent symbols. Thanks, accuser, jamey@minilop.net and Claude Paroz. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2012-03-02 16:55:56 +00:00
parent 7b624c6c32
commit 4887a8de17
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/views/generic/base.py
View File

@ -139,12 +139,11 @@ class RedirectView(View):
are provided as kwargs to this method. are provided as kwargs to this method.
""" """
if self.url: if self.url:
url = self.url % kwargs
args = self.request.META.get('QUERY_STRING', '') args = self.request.META.get('QUERY_STRING', '')
if args and self.query_string: if args and self.query_string:
url = "%s?%s" % (self.url, args) url = "%s?%s" % (url, args)
else: return url
url = self.url
return url % kwargs
else: else:
return None return None

7
tests/regressiontests/generic_views/base.py
View File

@ -283,6 +283,13 @@ class RedirectViewTest(unittest.TestCase):
self.assertEqual(response.status_code, 301) self.assertEqual(response.status_code, 301)
self.assertEqual(response['Location'], '/bar/?pork=spam') self.assertEqual(response['Location'], '/bar/?pork=spam')
def test_include_urlencoded_args(self):
"GET arguments can be URL-encoded when included in the redirected URL"
response = RedirectView.as_view(url='/bar/', query_string=True)(
self.rf.get('/foo/?unicode=%E2%9C%93'))
self.assertEqual(response.status_code, 301)
self.assertEqual(response['Location'], '/bar/?unicode=%E2%9C%93')
def test_parameter_substitution(self): def test_parameter_substitution(self):
"Redirection URLs can be parameterized" "Redirection URLs can be parameterized"
response = RedirectView.as_view(url='/bar/%(object_id)d/')(self.rf.get('/foo/42/'), object_id=42) response = RedirectView.as_view(url='/bar/%(object_id)d/')(self.rf.get('/foo/42/'), object_id=42)