X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=2dbd5c990ec692fa3ccf99b454f74fbab3d32492;hb=ff1befea16180a016a807b975fb4bee0bc53d662;hp=fec38f31f225f76ab741dbf802ed70e15938c998;hpb=3953592c299acc7770d4adeac3a95a7cb882cd0c;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index fec38f3..2dbd5c9 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -7,6 +7,8 @@ from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponseForbidden
 from django.views.generic.list_detail import object_detail, object_list
+from threadedcomments.models import ThreadedComment
+from threadedcomments.forms import ThreadedCommentForm
 from xerxes.influences.models import Character
 from xerxes.influences.models import Influence
 from xerxes.tools.forms import ContextModelForm
@@ -103,6 +105,19 @@ def influence_detail(request, object_id):
     # Don't show other player's influences
     if (o.character.player != request.user):
         return HttpResponseForbidden("Forbidden -- Trying to view influences of somebody else's character")
-    return render_to_response('influences/influence_detail.html', {'object' : o}, RequestContext(request))
+
+    # 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)
+    
+    context  = {
+        'object' : o,
+        'comments' : comments,
+        'comment_form' : ThreadedCommentForm(),
+    }
+    return render_to_response('influences/influence_detail.html', context, RequestContext(request))
 
 # vim: set sts=4 sw=4 expandtab: