X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=ea07c70c03f86c668562ced31549d3673d8bd72c;hb=3fdc7c9e5858d53c0d1863c9f9391ce520bb9c76;hp=1ab2d221a32d357b253db5e773afdd16be770f7f;hpb=4747f5ee71f66f8ee68425fb7c3e544e6f2ff5b1;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index 1ab2d22..ea07c70 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -7,9 +7,11 @@ 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 ee.influences.models import Character
-from ee.influences.models import Influence
-from ee.tools.forms import ContextModelForm
+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
 
 
 
@@ -50,7 +52,7 @@ def add_influence(request, character_id=None):
         # Redirect to the just saved influence
         return HttpResponseRedirect(reverse('influences_influence_detail', args=[influence.id]))
 
-    return render_to_response('influences/add.html', {'form' : f}, RequestContext(request))
+    return render_to_response('influences/add_influence.html', {'form' : f}, RequestContext(request))
 
 @login_required
 def add_character(request):
@@ -103,6 +105,11 @@ 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))
+    context  = {
+        'object' : o,
+        'comments' : ThreadedComment.public.get_tree(o),
+        'comment_form' : ThreadedCommentForm(),
+    }
+    return render_to_response('influences/influence_detail.html', context, RequestContext(request))
 
 # vim: set sts=4 sw=4 expandtab: