Commit 6319470f authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Fixed #10585: comment redirects built from the `next` parameter now work... 

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent eef2c5f6

django/contrib/comments/views/utils.py

+2 −1
Original line number Diff line number Diff line
@@ -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."):

tests/regressiontests/comment_tests/tests/comment_view_tests.py

+13 −0
Original line number Diff line number Diff line
@@ -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)

        
 No newline at end of file