X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/be26ac9493b40e87e07c773a8d7c79ef1e8b7b48..bfcf39c1ff103ab78ca8d1ee7d22c044d1b5e7cb:/forum/views/writers.py?ds=sidebyside diff --git a/forum/views/writers.py b/forum/views/writers.py index 99e9377..5064757 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -4,8 +4,7 @@ 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, HttpResponseForbidden, Http404 +from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.template import RequestContext from django.utils.html import * from django.utils import simplejson @@ -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.modules.decorators import decoratable +from forum.actions import AskAction, AnswerAction, ReviseAction, RollbackAction, RetagAction, AnswerToQuestionAction from forum.forms import * from forum.models import * -from forum.utils.forms import get_next_url +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) @@ -64,36 +68,60 @@ def upload(request):#ajax upload file to a question or answer return HttpResponse(result, mimetype="application/xml") -@decoratable def ask(request): - if request.POST and "text" in request.POST: - form = AskForm(request.POST) - if form.is_valid(): - if request.user.is_authenticated(): - ask_action = AskAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data) - question = ask_action.node + form = None - if settings.WIKI_ON and request.POST.get('wiki', False): - question.nstate.wiki = ask_action - - return HttpResponseRedirect(question.get_absolute_url()) - else: - request.session['temp_node_data'] = request.POST - request.session['temp_node_type'] = 'question' - return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'})) - elif request.method == "POST" and "go" in request.POST: - form = AskForm({'title': request.POST['q']}) - else: - form = AskForm() + if request.POST: + if request.session.pop('reviewing_pending_data', False): + form = AskForm(initial=request.POST, user=request.user) + elif "text" in request.POST: + form = AskForm(request.POST, user=request.user) + if form.is_valid(): + if request.user.is_authenticated() and request.user.email_valid_and_can_ask(): + ask_action = AskAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data) + question = ask_action.node + + if settings.WIKI_ON and request.POST.get('wiki', False): + question.nstate.wiki = ask_action + + return HttpResponseRedirect(question.get_absolute_url()) + else: + request.session[PENDING_SUBMISSION_SESSION_ATTR] = { + 'POST': request.POST, + 'data_name': _("question"), + 'type': 'ask', + 'submission_url': reverse('ask'), + 'time': datetime.datetime.now() + } + + if request.user.is_authenticated(): + request.user.message_set.create(message=_("Your question is pending until you %s.") % html.hyperlink( + reverse('send_validation_email'), _("validate your email") + )) + return HttpResponseRedirect(reverse('index')) + else: + return HttpResponseRedirect(reverse('auth_signin')) + elif "go" in request.POST: + form = AskForm({'title': request.POST['q']}, user=request.user) + + if not form: + form = AskForm(user=request.user) - #tags = _get_tags_cache_json() return render_to_response('ask.html', { 'form' : form, - #'tags' : tags, - 'email_validation_faq_url':reverse('faq') + '#validate', + 'tab' : 'ask' }, context_instance=RequestContext(request)) -@login_required +def convert_to_question(request, id): + user = request.user + answer = get_object_or_404(Answer, id=id) + + if not user.can_convert_to_question(answer): + return HttpResponseUnauthorized(request) + + return _edit_question(request, answer, template='node/convert_to_question.html', summary=_("Converted to question"), + action_class=AnswerToQuestionAction, 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): @@ -121,7 +149,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() @@ -134,7 +162,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: @@ -143,21 +171,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): @@ -199,28 +229,57 @@ def edit_answer(request, id): 'form': form, }, context_instance=RequestContext(request)) -@decoratable def answer(request, id): question = get_object_or_404(Question, id=id) - if request.POST: - form = AnswerForm(question, request.POST) - if form.is_valid(): - if request.user.is_authenticated(): - answer_action = AnswerAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(dict(question=question, **form.cleaned_data)) - answer = answer_action.node - if settings.WIKI_ON and request.POST.get('wiki', False): - answer.nstate.wiki = answer_action + if request.POST: + form = AnswerForm(request.POST, request.user) - return HttpResponseRedirect(answer.get_absolute_url()) - else: - request.session['temp_node_data'] = request.POST - request.session['temp_node_type'] = 'answer' - request.session['temp_question_id'] = id - return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'})) - else: + if request.session.pop('reviewing_pending_data', False) or not form.is_valid(): request.session['redirect_POST_data'] = request.POST return HttpResponseRedirect(question.get_absolute_url() + '#fmanswer') + if request.user.is_authenticated() and request.user.email_valid_and_can_answer(): + answer_action = AnswerAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(dict(question=question, **form.cleaned_data)) + answer = answer_action.node + + if settings.WIKI_ON and request.POST.get('wiki', False): + answer.nstate.wiki = answer_action + + return HttpResponseRedirect(answer.get_absolute_url()) + else: + request.session[PENDING_SUBMISSION_SESSION_ATTR] = { + 'POST': request.POST, + 'data_name': _("answer"), + 'type': 'answer', + 'submission_url': reverse('answer', kwargs={'id': id}), + 'time': datetime.datetime.now() + } + + if request.user.is_authenticated(): + request.user.message_set.create(message=_("Your answer is pending until you %s.") % html.hyperlink( + reverse('send_validation_email'), _("validate your email") + )) + return HttpResponseRedirect(question.get_absolute_url()) + else: + return HttpResponseRedirect(reverse('auth_signin')) + return HttpResponseRedirect(question.get_absolute_url()) + +def manage_pending_data(request, action, forward=None): + pending_data = request.session.pop(PENDING_SUBMISSION_SESSION_ATTR, None) + + if not pending_data: + raise Http404 + + if action == _("cancel"): + return HttpResponseRedirect(forward or request.META.get('HTTP_REFERER', '/')) + else: + if action == _("review"): + request.session['reviewing_pending_data'] = True + + request.session['redirect_POST_data'] = pending_data['POST'] + return HttpResponseRedirect(pending_data['submission_url']) + +