Let Influence list and annote its comments itself.

[matthijs/projects/xerxes.git] / influences / views.py

diff --git a/influences/views.py b/influences/views.py
index b49b1003bbef82624c72663f67996c42fcfc3b07..e1ec516a5ca30f024aae289ac8dd4c92dd54356e 100644 (file)
--- a/influences/views.py
+++ b/influences/views.py
@@ -89,9 +89,6 @@ def influence_list(request):
     os = Influence.objects.filter(character__player=request.user)
     return render_to_response('influences/influence_list.html', {'object_list' : os}, RequestContext(request))
 
-def quote_reply(comment):
-    return "\n".join(["> " + l for l in comment.comment.split("\n")])
-
 @login_required
 def influence_detail(request, object_id):
 
@@ -102,15 +99,7 @@ def influence_detail(request, object_id):
 
     # Show all comments to staff, but only public comments to other
     # users
-    if request.user.is_staff:
-        comments = ThreadedComment.objects.get_tree(o)
-    else:
-        comments = ThreadedComment.public.get_tree(o)
-
-    # Annotate each comment with a proper reply form
-    for comment in comments:
-        initial = { 'comment' : quote_reply(comment) }
-        comment.reply_form = get_influence_comment_form(request.user.is_staff, comment)(initial=initial)
+    comments = o.get_comments(private=request.user.is_staff)
     
     context  = {
         'object' : o,