Enforce blog posts not allowing commenting on them

rophako/modules/blog/templates/blog/entry.inc.html

@@ -81,6 +81,7 @@
         {{ include_page("comment.partial_index",
             thread="blog-"+post["post_id"]|string,
             subject=post["subject"],
+            addable=post["comments"],
         ) | safe }}
     {% endif %}
 

rophako/modules/comment/__init__.py

@@ -168,8 +168,13 @@ def unsubscribe():
     return template("comment/unsubscribed.html")
 
 
-def partial_index(thread, subject, header=True):
+def partial_index(thread, subject, header=True, addable=True):
-    """Partial template for including the index view of a comment thread."""
+    """Partial template for including the index view of a comment thread.
+
+    * thread: unique name for the comment thread
+    * subject: subject name for the comment thread
+    * header: show the Comments h1 header
+    * addable: boolean, can new comments be added to the thread"""
 
     comments = Comment.get_comments(thread)
 
@@ -199,6 +204,7 @@ def partial_index(thread, subject, header=True):
     g.info["header"] = header
     g.info["thread"] = thread
     g.info["subject"] = subject
+    g.info["commenting_disabled"] = not addable
     g.info["url"] = request.url
     g.info["comments"] = sorted_comments
     g.info["photo_url"] = Config.photo.root_public

rophako/modules/comment/templates/comment/form.inc.html

@@ -1,11 +1,14 @@
 {# Common template for leaving a comment/updating the comment preview. #}
 
-<form name="comment" action="{{ url_for('comment.preview') }}" method="POST">
+{% if commenting_disabled %}
-<input type="hidden" name="token" value="{{ csrf_token() }}">
+    No new comments may be added to this thread.
-<input type="hidden" name="thread" value="{{ thread }}">
+{% else %}
-<input type="hidden" name="url" value="{{ url }}">
+    <form name="comment" action="{{ url_for('comment.preview') }}" method="POST">
-<input type="hidden" name="subject" value="{{ subject }}">
+    <input type="hidden" name="token" value="{{ csrf_token() }}">
-<table border="0" cellspacing="2" cellpadding="2">
+    <input type="hidden" name="thread" value="{{ thread }}">
+    <input type="hidden" name="url" value="{{ url }}">
+    <input type="hidden" name="subject" value="{{ subject }}">
+    <table border="0" cellspacing="2" cellpadding="2">
         <tr>
             <td align="left" valign="middle">
                 Your name:
@@ -48,19 +51,20 @@
                 </label>
             </td>
         </tr>
-</table><p>
+    </table><p>
 
-<div style="display: none">
+    <div style="display: none">
         If you can see this, don't touch the following fields.<br>
         <input type="text" class="form-control" name="website" value="http://"><br>
         <input type="text" class="form-control" name="email" value="">
-</div>
+    </div>
 
-{% if preview %}
+    {% if preview %}
         <button class="btn btn-default" type="submit" name="action" value="preview">Refresh Preview</button>
         <button class="btn btn-primary" type="submit" name="action" value="submit">Submit Comment</button>
-{% else %}
+    {% else %}
         <button class="btn btn-primary" type="submit" name="action" value="preview">Leave Comment</button>
-{% endif %}
+    {% endif %}
 
-</form>
+    </form>
+{% endif %}