X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=35ee02ef921227f8faf626fb355ad031c8422440;hb=6ddbd39b9bfb49ffeb8e444b3cbe23a378cd36f2;hp=1025efa2e8ea6a5cbb5dff4d12bf610c00a94a1f;hpb=ceafe55f5acae09c6f51b72881a3d564bfe730fa;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/views.py b/influences/views.py index 1025efa..35ee02e 100644 --- a/influences/views.py +++ b/influences/views.py @@ -92,8 +92,6 @@ def influence_list(request): def influence_comment_preview(request, context_processors, extra_context, **kwargs): # Use a custom template kwargs['template'] = 'influences/influence_comment_preview.html' - # The base template to extend - extra_context['base'] = "influences/influence_detail.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) @@ -118,13 +116,13 @@ def influence_detail(request, object_id): return render_to_response('influences/influence_detail.html', context, RequestContext(request)) @login_required -def influence_comment(request, object_id, edit_id=None): +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 @@ -138,6 +136,6 @@ def influence_comment(request, object_id, edit_id=None): kwargs['preview'] = influence_comment_preview if parent_id: kwargs['prefix'] = "reply-to-%s" % (parent_id) - return free_comment(request, object_id=object_id, edit_id=edit_id, **kwargs) + return free_comment(request, object_id=object_id, parent_id=parent_id, **kwargs) # vim: set sts=4 sw=4 expandtab: