Ticket #13344: 13344.diff

contrib/comments/views/moderation.py

@@ -28 +28 @@
     # Render a form on GET
     else:
         return render_to_response('comments/flag.html',
-            {'comment': comment, "next": next},
+            {'comment': comment, "post_comment_next": next},
             template.RequestContext(request)
         )
 
@@ -55 +55 @@
     # Render a form on GET
     else:
         return render_to_response('comments/delete.html',
-            {'comment': comment, "next": next},
+            {'comment': comment, "post_comment_next": next},
             template.RequestContext(request)
         )
 
@@ -82 +82 @@
     # Render a form on GET
     else:
         return render_to_response('comments/approve.html',
-            {'comment': comment, "next": next},
+            {'comment': comment, "post_comment_next": next},
             template.RequestContext(request)
         )
 

contrib/comments/views/comments.py

@@ -96 +96 @@
             template_list, {
                 "comment" : form.data.get("comment", ""),
                 "form" : form,
-                "next": next,
+                "post_comment_next": next,
             },
             RequestContext(request, {})
         )

contrib/comments/templates/comments/approve.html

@@ -7 +7 @@
   <h1>{% trans "Really make this comment public?" %}</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
   <form action="." method="post">{% csrf_token %}
-    {% if next %}<input type="hidden" name="next" value="{{ next }}" id="next" />{% endif %}
+    {% if post_comment_next %}<input type="hidden" name="next" value="{{ post_comment_next }}" id="next" />{% endif %}
     <p class="submit">
       <input type="submit" name="submit" value="{% trans "Approve" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>
     </p>

contrib/comments/templates/comments/preview.html

@@ -6 +6 @@
 {% block content %}
   {% load comments %}
   <form action="{% comment_form_target %}" method="post">{% csrf_token %}
-    {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
+    {% if post_comment_next %}<input type="hidden" name="next" value="{{ post_comment_next }}" />{% endif %}
     {% if form.errors %}
     <h1>{% blocktrans count form.errors|length as counter %}Please correct the error below{% plural %}Please correct the errors below{% endblocktrans %}</h1>
     {% else %}

contrib/comments/templates/comments/delete.html

@@ -7 +7 @@
 <h1>{% trans "Really remove this comment?" %}</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
   <form action="." method="post">{% csrf_token %}
-    {% if next %}<input type="hidden" name="next" value="{{ next }}" id="next" />{% endif %}
+    {% if post_comment_next %}<input type="hidden" name="next" value="{{ post_comment_next }}" id="next" />{% endif %}
     <p class="submit">
     <input type="submit" name="submit" value="{% trans "Remove" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>
     </p>

contrib/comments/templates/comments/form.html

@@ -1 +1 @@
 {% load comments i18n %}
 <form action="{% comment_form_target %}" method="post">{% csrf_token %}
-  {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
+  {% if post_comment_next %}<input type="hidden" name="next" value="{{ post_comment_next }}" />{% endif %}
   {% for field in form %}
     {% if field.is_hidden %}
       {{ field }}

contrib/comments/templates/comments/flag.html

@@ -7 +7 @@
 <h1>{% trans "Really flag this comment?" %}</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
   <form action="." method="post">{% csrf_token %}
-    {% if next %}<input type="hidden" name="next" value="{{ next }}" id="next" />{% endif %}
+    {% if post_comment_next %}<input type="hidden" name="next" value="{{ post_comment_next }}" id="next" />{% endif %}
     <p class="submit">
     <input type="submit" name="submit" value="{% trans "Flag" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>
     </p>