X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=35ee02ef921227f8faf626fb355ad031c8422440;hb=6ddbd39b9bfb49ffeb8e444b3cbe23a378cd36f2;hp=b49b1003bbef82624c72663f67996c42fcfc3b07;hpb=0cc5c005cc3e24e3859fe00edfa01f560025a7ee;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index b49b100..35ee02e 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -10,7 +10,7 @@ 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.views import free_comment
+from threadedcomments.views import free_comment, _preview
 from xerxes.influences.models import Character
 from xerxes.influences.models import Influence
 from forms import get_influence_comment_form, InfluenceForm, CharacterForm
@@ -89,8 +89,12 @@ 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")])
+def influence_comment_preview(request, context_processors, extra_context, **kwargs):
+    # Use a custom template
+    kwargs['template'] = 'influences/influence_comment_preview.html'
+    # The object to be show in the influence detail
+    extra_context['object'] = get_object_or_404(Influence, pk=kwargs['object_id'])
+    return _preview(request, context_processors, extra_context, **kwargs)
 
 @login_required
 def influence_detail(request, object_id):
@@ -102,15 +106,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,
@@ -120,20 +116,26 @@ def influence_detail(request, object_id):
     return render_to_response('influences/influence_detail.html', context, RequestContext(request))
 
 @login_required
-def influence_comment(request, edit_id=None, *args, **kwargs):
+def influence_comment(request, object_id, parent_id=None):
+    kwargs = {}
     # Add the content_type, since we don't put in in the url explicitly
     kwargs['content_type'] = ContentType.objects.get_for_model(Influence).id
     # Find the comment to which we're replying, so we can get the right form for it.
-    if edit_id:
-        reply_to = get_object_or_404(ThreadedComment, id=edit_id)
+    if parent_id:
+        reply_to = get_object_or_404(ThreadedComment, id=parent_id)
     else:
         reply_to = None
+
     # Find the right form class
     kwargs['form_class']   = get_influence_comment_form(request.user.is_staff, reply_to)
     # Override the model, so we don't get a free comment, but a normal
     # one. We can't use threadedcomments' comment view for that, since
     # that hardcodes the form_class.
     kwargs['model'] = ThreadedComment
-    return free_comment(request, edit_id=edit_id, *args, **kwargs)
+    # Set a custom preview view
+    kwargs['preview'] = influence_comment_preview
+    if parent_id:
+        kwargs['prefix'] = "reply-to-%s" % (parent_id)
+    return free_comment(request, object_id=object_id, parent_id=parent_id, **kwargs)
 
 # vim: set sts=4 sw=4 expandtab: