X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=e1ec516a5ca30f024aae289ac8dd4c92dd54356e;hb=06863704f30a2025ee82fd89a41716f5ab2cce87;hp=6a6f874a7c242d621d5ef595cfc9ebe7bb38b57d;hpb=0df2763af613ff7e52a6d823b1c99787b3dc7db1;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index 6a6f874..e1ec516 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -10,71 +10,10 @@ 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 threadedcomments.views import free_comment
 from xerxes.influences.models import Character
 from xerxes.influences.models import Influence
-from xerxes.tools.forms import ContextModelForm
-
-#
-# A few comment form classes, to handle the various cases (staff/no staff,
-# reply to public/private post)
-# 
-# It is probably possible to reduce this mess a bit using metaclasses, but I
-# didn't get this to work yet.
-# 
-class InfluenceCommentForm(ThreadedCommentForm):
-    def __init__(self, *args, **kwargs):
-        super(InfluenceCommentForm, self).__init__(*args, **kwargs)
-
-    class Meta(ThreadedCommentForm.Meta):
-        exclude = ('markup', )
-
-class AdminInfluenceCommentForm(ThreadedCommentForm):
-    def __init__(self, *args, **kwargs):
-        super(AdminInfluenceCommentForm, self).__init__(*args, **kwargs)
-
-    class Meta(ThreadedCommentForm.Meta):
-        fields = ThreadedCommentForm.Meta.fields + ('is_public',)
-
-class AdminPrivateInfluenceCommentForm(ThreadedCommentForm):
-    def __init__(self, *args, **kwargs):
-        super(AdminPrivateInfluenceCommentForm, self).__init__(*args, **kwargs)
-        self.instance.is_public = False
-
-def get_influence_comment_form(is_staff, reply_to):
-    """ Gets the form class that a user can use to reply to the given comment.
-    reply_to can be None, in which case the form class for a new comment is
-    returned. """
-    allow_markup = allow_private = is_staff
-    if reply_to:
-        allow_public = reply_to.is_public
-    else:
-        allow_public = True
-    return _get_influence_comment_form(allow_markup, allow_public, allow_private)
-    
-def _get_influence_comment_form(allow_markup, allow_public, allow_private):
-    """ Internal wrapper that selects the right form class depending on the
-    given options. Should not be called directly, call
-    get_influence_comment_form instead. """
-    if allow_markup and allow_public and allow_private:
-        return AdminInfluenceCommentForm
-    elif allow_markup and not allow_public and allow_private:
-        return AdminPrivateInfluenceCommentForm
-    elif not allow_markup and allow_public and not allow_private:
-        return InfluenceCommentForm
-    else:
-        raise Exception("Unsupported configuration")
-
-class InfluenceForm(ContextModelForm):
-    class Meta:
-        model = Influence
-        fields = ('character', 'contact', 'summary', 'description')
-
-class CharacterForm(ContextModelForm):
-    class Meta:
-        model = Character
-        fields = ('name')
+from forms import get_influence_comment_form, InfluenceForm, CharacterForm
 
 @login_required
 def add_influence(request, character_id=None):
@@ -153,9 +92,6 @@ def influence_list(request):
 @login_required
 def influence_detail(request, object_id):
 
-    def quote_reply(comment):
-        return "\n".join(["> " + l for l in comment.comment.split("\n")])
-
     o = Influence.objects.get(pk=object_id)
     # Don't show other player's influences
     if (o.character.player != request.user):
@@ -163,20 +99,12 @@ 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,
         'comments' : comments,
-        'comment_form' : get_influence_comment_form(request.user.is_staff, None)
+        'comment_form' : get_influence_comment_form(request.user.is_staff, None)()
     }
     return render_to_response('influences/influence_detail.html', context, RequestContext(request))