merging jambazov > trunk

[osqa.git] / forum / templatetags / node_tags.py

diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 01745be5fb82b936c44ef8e2742c28af1e65391d..544d91872da498422acceab42c90726b9fb9494f 100644 (file)
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -90,6 +90,12 @@ def post_controls(post, user):
         controls.append(post_control(_('permanent link'), reverse('answer_permanent_link', kwargs={'id' : post.id}),\r
                                      title=_("answer permanent link"), command=True, withprompt=True))\r
 \r
+        # Users should be able to award points for an answer. Users cannot award their own answers\r
+        if user != post.author and user.is_authenticated():\r
+            controls.append(post_control(_("award points"), reverse('award_points', kwargs={'user_id' : post.author.id,\r
+                                         'answer_id' : post.id}), title=_("award points to %s") % post.author,\r
+                                         command=True, withprompt=True))\r
+\r
     # The other controls are visible only to authenticated users.\r
     if user.is_authenticated():\r
         try:\r