Some improvements in cache.

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

diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 72bfaf2a25939382ca634532e7e787fea030dd8d..454819437223e61bbe26b5c49ed3aaa3f625e265 100644 (file)
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -29,7 +29,7 @@ def accept_button(answer, user):
 @register.inclusion_tag('node/favorite_mark.html')\r
 def favorite_mark(question, user):\r
     try:\r
-        FavoriteAction.objects.get(node=question, user=user)\r
+        FavoriteAction.objects.get(canceled=False, node=question, user=user)\r
         favorited = True\r
     except:\r
         favorited = False\r
@@ -42,6 +42,7 @@ def post_control(text, url, command=False, withprompt=False, title=""):
 @register.inclusion_tag('node/post_controls.html')\r
 def post_controls(post, user):\r
     controls = []\r
+    menu = []\r
 \r
     if user.is_authenticated():\r
         post_type = (post.__class__ is Question) and 'question' or 'answer'\r
@@ -78,7 +79,15 @@ def post_controls(post, user):
                 controls.append(post_control(_('delete'), reverse('delete_post', kwargs={'id': post.id}),\r
                         command=True))\r
 \r
-    return {'controls': controls}\r
+        if user.can_wikify(post):\r
+            menu.append(post_control(_('mark as community wiki'), reverse('wikify', kwargs={'id': post.id}),\r
+                        command=True))\r
+\r
+        if post.node_type == "answer" and user.can_convert_to_comment(post):\r
+            menu.append(post_control(_('convert to comment'), reverse('convert_to_comment', kwargs={'id': post.id}),\r
+                        command=True, withprompt=True))\r
+\r
+    return {'controls': controls, 'menu': menu, 'post': post, 'user': user}\r
 \r
 @register.inclusion_tag('node/comments.html')\r
 def comments(post, user):\r
@@ -131,8 +140,8 @@ def contributors_info(node):
         'node': node,\r
     }\r
 \r
-\r
 @register.inclusion_tag("node/reviser_info.html")\r
 def reviser_info(revision):\r
     return {'revision': revision}\r
 \r
+\r