Ticket #11110: next_redirect_via_comment_preview.diff

django/contrib/comments/views/comments.py

@@ -80 +80 @@
             template_list, {
                 "comment" : form.data.get("comment", ""),
                 "form" : form,
-                "next": next,
+                "next": next or data.get("next", None),
             },
             RequestContext(request, {})
         )

tests/regressiontests/comment_tests/tests/comment_view_tests.py

@@ -219 +219 @@
         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
+        
+    def testCommentPreviewWithNext(self):
+        """
+        The preview view needs to handle the `next` key being passed in (#11110)
+        """
+        a = Article.objects.get(pk=1)
+        data = self.getValidData(a)
+        data["preview"] = "Preview"
+        data["next"] = "/somewhere/else/"
+        response = self.client.post("/post/", data)
+        self.assertTemplateUsed(response, "comments/preview.html")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context[0]["next"], data["next"])