innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #13411 -- Made sure URL fragments are correctly handled by the next_redirect utility of the comments apps. Thanks, timesong, dpn and Julien Phalip. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-03-03 13:03:53 +00:00
parent 49cfe25399
commit c0fb9bd00b
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,8 +25,15 @@ def next_redirect(data, default, default_view, **get_kwargs):
if next is None: if next is None:
next = urlresolvers.reverse(default_view) next = urlresolvers.reverse(default_view)
if get_kwargs: if get_kwargs:
if '#' in next:
tmp = next.rsplit('#', 1)
next = tmp[0]
anchor = '#' + tmp[1]
else:
anchor = ''
joiner = ('?' in next) and '&' or '?' joiner = ('?' in next) and '&' or '?'
next += joiner + urllib.urlencode(get_kwargs) next += joiner + urllib.urlencode(get_kwargs) + anchor
return HttpResponseRedirect(next) return HttpResponseRedirect(next)
def confirmation_view(template, doc="Display a confirmation view."): def confirmation_view(template, doc="Display a confirmation view."):

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

@ -256,3 +256,27 @@ class CommentViewTests(CommentTestCase):
broken_location = location + u"\ufffd" broken_location = location + u"\ufffd"
response = self.client.get(broken_location) response = self.client.get(broken_location)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
def testCommentNextWithQueryStringAndAnchor(self):
"""
The `next` key needs to handle already having an anchor. Refs #13411.
"""
# With a query string also.
a = Article.objects.get(pk=1)
data = self.getValidData(a)
data["next"] = "/somewhere/else/?foo=bar#baz"
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+#baz$", location)
self.failUnless(match != None, "Unexpected redirect location: %s" % location)
# Without a query string
a = Article.objects.get(pk=1)
data = self.getValidData(a)
data["next"] = "/somewhere/else/#baz"
data["comment"] = "This is another comment"
response = self.client.post("/post/", data)
location = response["Location"]
match = re.search(r"^http://testserver/somewhere/else/\?c=\d+#baz$", location)
self.failUnless(match != None, "Unexpected redirect location: %s" % location)