X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=35ee02ef921227f8faf626fb355ad031c8422440;hb=6ddbd39b9bfb49ffeb8e444b3cbe23a378cd36f2;hp=ca1a1e1e01baffe85c9d2766af6c6bc1b20affff;hpb=435a62554852c2863d2247c04df4342e002576fc;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/views.py b/influences/views.py index ca1a1e1..35ee02e 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 comment +from threadedcomments.views import free_comment, _preview 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): @@ -150,12 +89,16 @@ 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 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): - 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,34 +106,36 @@ 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)) @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) - return comment(request, edit_id=edit_id, *args, **kwargs) + # 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 + # 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: