mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity

Fixed #10585: comment redirects built from the next parameter now work correctly when next already contains a query string.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2009-04-07 19:49:07 +00:00
parent eef2c5f6de
commit 6319470f88
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/comments/views/utils.py
View File

@ -25,7 +25,8 @@ def next_redirect(data, default, default_view, **get_kwargs):
if next is None:
next = urlresolvers.reverse(default_view)
if get_kwargs:
next += "?" + urllib.urlencode(get_kwargs)
joiner = ('?' in next) and '&' or '?'
next += joiner + urllib.urlencode(get_kwargs)
return HttpResponseRedirect(next)
def confirmation_view(template, doc="Display a confirmation view."):

13
tests/regressiontests/comment_tests/tests/comment_view_tests.py
View File

@ -207,3 +207,16 @@ class CommentViewTests(CommentTestCase):
self.assertTemplateUsed(response, "comments/posted.html")
self.assertEqual(response.context[0]["comment"], Comment.objects.get(pk=pk))
def testCommentNextWithQueryString(self):
"""
The `next` key needs to handle already having a query string (#10585)
"""
a = Article.objects.get(pk=1)
data = self.getValidData(a)
data["next"] = "/somewhere/else/?foo=bar"
data["comment"] = "This is another comment"
response = self.client.post("/post/", data)
location = response["Location"]
match = re.search(r"^http://testserver/somewhere/else/\?foo=bar&c=\d+$", location)
self.failUnless(match != None, "Unexpected redirect location: %s" % location)