X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0a3506ef33141207e7e879fe763dc3adacbc591e..aa9d250fc29ad29a9b7863a6253e906c772df914:/forum/views/writers.py diff --git a/forum/views/writers.py b/forum/views/writers.py index c9b005b..8e9c544 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -4,7 +4,6 @@ import time, datetime, random import logging from django.core.files.storage import FileSystemStorage from django.shortcuts import render_to_response, get_object_or_404 -from django.contrib.auth.decorators import login_required from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.template import RequestContext from django.utils.html import * @@ -13,12 +12,14 @@ 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 +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 def upload(request):#ajax upload file to a question or answer class FileTypeNotAllow(Exception): @@ -37,13 +38,16 @@ def upload(request):#ajax upload file to a question or answer raise UploadPermissionNotAuthorized() # check file type - file_name_suffix = os.path.splitext(f.name)[1].lower() + try: + file_name_suffix = os.path.splitext(f.name)[1].lower() + except KeyError: + raise FileTypeNotAllow() if not file_name_suffix in ('.jpg', '.jpeg', '.gif', '.png', '.bmp', '.tiff', '.ico'): raise FileTypeNotAllow() storage = FileSystemStorage(str(settings.UPFILES_FOLDER), str(settings.UPFILES_ALIAS)) - new_file_name = storage.save(f.name, f) + new_file_name = storage.save("_".join(f.name.split()), f) # check file size # byte size = storage.size(new_file_name) @@ -82,7 +86,7 @@ def ask(request): return HttpResponseRedirect(question.get_absolute_url()) else: - request.session['pending_submission_data'] = { + request.session[PENDING_SUBMISSION_SESSION_ATTR] = { 'POST': request.POST, 'data_name': _("question"), 'type': 'ask', @@ -105,9 +109,26 @@ def ask(request): return render_to_response('ask.html', { 'form' : form, + 'tab' : 'ask' }, context_instance=RequestContext(request)) -@login_required +def convert_to_question(request, id): + user = request.user + + node_type = request.GET.get('node_type', 'answer') + if node_type == 'comment': + node = get_object_or_404(Comment, id=id) + action_class = CommentToQuestionAction + else: + node = get_object_or_404(Answer, id=id) + action_class = AnswerToQuestionAction + + if not user.can_convert_to_question(node): + return HttpResponseUnauthorized(request) + + return _edit_question(request, node, template='node/convert_to_question.html', summary=_("Converted to question"), + action_class =action_class, allow_rollback=False, url_getter=lambda a: Question.objects.get(id=a.id).get_absolute_url()) + def edit_question(request, id): question = get_object_or_404(Question, id=id) if question.nis.deleted and not request.user.can_view_deleted_post(question): @@ -135,7 +156,7 @@ def _retag_question(request, question): #'tags' : _get_tags_cache_json(), }, context_instance=RequestContext(request)) -def _edit_question(request, question): +def _edit_question(request, question, template='question_edit.html', summary='', action_class=ReviseAction, allow_rollback=True, url_getter=lambda q: q.get_absolute_url()): if request.method == 'POST': revision_form = RevisionForm(question, data=request.POST) revision_form.is_valid() @@ -148,7 +169,7 @@ def _edit_question(request, question): if not 'select_revision' in request.POST and form.is_valid(): if form.has_changed(): - action = ReviseAction(user=request.user, node=question, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data) + action = action_class(user=request.user, node=question, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data) if settings.WIKI_ON: if request.POST.get('wiki', False) and not question.nis.wiki: @@ -157,21 +178,23 @@ def _edit_question(request, question): question.nstate.wiki = None else: if not revision == question.active_revision: - RollbackAction(user=request.user, node=question).save(data=dict(activate=revision)) + if allow_rollback: + RollbackAction(user=request.user, node=question).save(data=dict(activate=revision)) + else: + pass - return HttpResponseRedirect(question.get_absolute_url()) + return HttpResponseRedirect(url_getter(question)) else: revision_form = RevisionForm(question) - form = EditQuestionForm(question, request.user) + form = EditQuestionForm(question, request.user, initial={'summary': summary}) - return render_to_response('question_edit.html', { + return render_to_response(template, { 'question': question, 'revision_form': revision_form, 'form' : form, - #'tags' : _get_tags_cache_json() }, context_instance=RequestContext(request)) -@login_required + def edit_answer(request, id): answer = get_object_or_404(Answer, id=id) if answer.deleted and not request.user.can_view_deleted_post(answer): @@ -217,7 +240,7 @@ def answer(request, id): question = get_object_or_404(Question, id=id) if request.POST: - form = AnswerForm(question, request.POST) + form = AnswerForm(request.POST, request.user) if request.session.pop('reviewing_pending_data', False) or not form.is_valid(): request.session['redirect_POST_data'] = request.POST @@ -232,7 +255,7 @@ def answer(request, id): return HttpResponseRedirect(answer.get_absolute_url()) else: - request.session['pending_submission_data'] = { + request.session[PENDING_SUBMISSION_SESSION_ATTR] = { 'POST': request.POST, 'data_name': _("answer"), 'type': 'answer', @@ -252,7 +275,7 @@ def answer(request, id): def manage_pending_data(request, action, forward=None): - pending_data = request.session.pop('pending_submission_data', None) + pending_data = request.session.pop(PENDING_SUBMISSION_SESSION_ATTR, None) if not pending_data: raise Http404