From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Fri, 6 Apr 2012 14:04:20 +0000 (+0000)
Subject: make {% comments %} template tag decoratable and add ability to attach additional... 
X-Git-Tag: live~73
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/9f1d9b668a5de15e370dc0cd85997f458bbb2c98

make {% comments %} template tag decoratable and add ability to attach additional post controls to them

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1244 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/templates/node/comments.html b/forum/skins/default/templates/node/comments.html
index b34b58d..a84ef89 100644
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -29,7 +29,10 @@
                     <a rel="nofollow" id="comment-{{ comment.id }}-convert-to-question" href="{% url convert_to_question id=comment.id %}?node_type=comment" title="{% trans "Convert comment to question" %}"
                         class="comment-convert-to-question" rel="nofollow"> </a>
                 {% endif %}
-                    
+
+                {% if comment.additional_controls %}
+                    {{ comment.additional_controls }}
+                {% endif %}
 
                 <span class="comment-age">({% diff_date comment.added_at %})</span>
                 <a class="comment-user userinfo" href="{{comment.user.get_profile_url}}">{{comment.user.decorated_name}}</a>
diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index aee496a..2bc3c4b 100644
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -192,8 +192,7 @@ def post_controls(post, user):
 
     return {'controls': controls, 'menu': menu, 'post': post, 'user': user}
 
-@register.inclusion_tag('node/comments.html')
-def comments(post, user):
+def _comments(post, user):
     all_comments = post.comments.filter_state(deleted=False)\
                                 .order_by('-added_at' if settings.SHOW_LATEST_COMMENTS_FIRST else 'added_at')
 
@@ -250,6 +249,9 @@ def comments(post, user):
         'user': user,
     }
 
+@register.inclusion_tag('node/comments.html')
+def comments(post, user):
+    return _comments(post, user)
 
 @register.inclusion_tag("node/contributors_info.html")
 def contributors_info(node, verb=None):