X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/93c313ff9d33d0efa64f8149fae2b108146dd237..46b868a3f5ffa8f693808cb832306286802124f4:/forum/views/writers.py diff --git a/forum/views/writers.py b/forum/views/writers.py index 60fc30f..8c7980a 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -1,25 +1,21 @@ # encoding:utf-8 import os.path -import time, datetime, random -import logging -from django.views.decorators.csrf import csrf_exempt +import datetime + +from django.core.urlresolvers import reverse from django.core.files.storage import FileSystemStorage +from django.views.decorators.csrf import csrf_exempt from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.template import RequestContext +from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.utils.html import * -from django.utils import simplejson from django.utils.translation import ugettext as _ -from django.core.urlresolvers import reverse -from django.core.exceptions import PermissionDenied from forum.actions import AskAction, AnswerAction, ReviseAction, RollbackAction, RetagAction, AnswerToQuestionAction, CommentToQuestionAction from forum.forms import * from forum.models import * -from forum.forms import get_next_url from forum.utils import html - from forum.http_responses import HttpResponseUnauthorized from vars import PENDING_SUBMISSION_SESSION_ATTR @@ -160,7 +156,8 @@ def _retag_question(request, question): #'tags' : _get_tags_cache_json(), }, context_instance=RequestContext(request)) -def _edit_question(request, question, template='question_edit.html', summary='', action_class=ReviseAction, allow_rollback=True, url_getter=lambda q: q.get_absolute_url()): +def _edit_question(request, question, template='question_edit.html', summary='', action_class=ReviseAction, + allow_rollback=True, url_getter=lambda q: q.get_absolute_url(), additional_context=None): if request.method == 'POST': revision_form = RevisionForm(question, data=request.POST) revision_form.is_valid() @@ -192,11 +189,16 @@ def _edit_question(request, question, template='question_edit.html', summary='', revision_form = RevisionForm(question) form = EditQuestionForm(question, request.user, initial={'summary': summary}) - return render_to_response(template, { + context = { 'question': question, 'revision_form': revision_form, 'form' : form, - }, context_instance=RequestContext(request)) + } + + if not (additional_context is None): + context.update(additional_context) + + return render_to_response(template, context, context_instance=RequestContext(request)) def edit_answer(request, id):