X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/8eed5a6d3da1221e41b05c423c15fdc227c283ae..988c0eb318f4af28bad7d7714e7410699d7cae30:/forum/views/writers.py?ds=sidebyside diff --git a/forum/views/writers.py b/forum/views/writers.py index 98b523e..c9b005b 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -5,7 +5,7 @@ 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 @@ -16,9 +16,8 @@ from django.core.exceptions import PermissionDenied from forum.actions import AskAction, AnswerAction, ReviseAction, RollbackAction, RetagAction from forum.forms import * from forum.models import * -from forum.const import * -from forum.utils.forms import get_next_url -from forum.views.commands import SpamNotAllowedException +from forum.forms import get_next_url +from forum.utils import html def upload(request):#ajax upload file to a question or answer @@ -29,7 +28,6 @@ def upload(request):#ajax upload file to a question or answer class UploadPermissionNotAuthorized(Exception): pass - #%s xml_template = "%s" try: @@ -66,45 +64,53 @@ def upload(request):#ajax upload file to a question or answer return HttpResponse(result, mimetype="application/xml") - def ask(request): - if request.POST and "text" in request.POST: - form = AskForm(request.POST) - if form.is_valid(): - if request.user.is_authenticated(): - data = { - "user_ip":request.META["REMOTE_ADDR"], - "user_agent":request.environ['HTTP_USER_AGENT'], - "comment_author":request.user.username, - "comment_author_email":request.user.email, - "comment_author_url":request.user.website, - "comment":request.POST['text'] - } - if Node.isSpam(request.POST['text'], data): - raise SpamNotAllowedException("question") - - question = AskAction(user=request.user).save(data=form.cleaned_data).node - 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() + form = None + + 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_data'] = { + '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', }, context_instance=RequestContext(request)) @login_required def edit_question(request, id): question = get_object_or_404(Question, id=id) - if question.deleted and not request.user.can_view_deleted_post(question): + if question.nis.deleted and not request.user.can_view_deleted_post(question): raise Http404 if request.user.can_edit_post(question): return _edit_question(request, question) @@ -118,7 +124,7 @@ def _retag_question(request, question): form = RetagQuestionForm(question, request.POST) if form.is_valid(): if form.has_changed(): - RetagAction(user=request.user, node=question).save(data=dict(tagnames=form.cleaned_data['tags'])) + RetagAction(user=request.user, node=question, ip=request.META['REMOTE_ADDR']).save(data=dict(tagnames=form.cleaned_data['tags'])) return HttpResponseRedirect(question.get_absolute_url()) else: @@ -136,13 +142,19 @@ def _edit_question(request, question): revision = question.revisions.get(revision=revision_form.cleaned_data['revision']) if 'select_revision' in request.POST: - form = EditQuestionForm(question, revision) + form = EditQuestionForm(question, request.user, revision) else: - form = EditQuestionForm(question, revision, data=request.POST) + form = EditQuestionForm(question, request.user, revision, data=request.POST) if not 'select_revision' in request.POST and form.is_valid(): if form.has_changed(): - ReviseAction(user=request.user, node=question).save(data=form.cleaned_data) + action = ReviseAction(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: + question.nstate.wiki = action + elif question.nis.wiki and (not request.POST.get('wiki', False)) and request.user.can_cancel_wiki(question): + question.nstate.wiki = None else: if not revision == question.active_revision: RollbackAction(user=request.user, node=question).save(data=dict(activate=revision)) @@ -150,7 +162,7 @@ def _edit_question(request, question): return HttpResponseRedirect(question.get_absolute_url()) else: revision_form = RevisionForm(question) - form = EditQuestionForm(question) + form = EditQuestionForm(question, request.user) return render_to_response('question_edit.html', { 'question': question, @@ -173,22 +185,28 @@ def edit_answer(request, id): revision = answer.revisions.get(revision=revision_form.cleaned_data['revision']) if 'select_revision' in request.POST: - form = EditAnswerForm(answer, revision) + form = EditAnswerForm(answer, request.user, revision) else: - form = EditAnswerForm(answer, revision, data=request.POST) + form = EditAnswerForm(answer, request.user, revision, data=request.POST) if not 'select_revision' in request.POST and form.is_valid(): if form.has_changed(): - ReviseAction(user=request.user, node=answer).save(data=form.cleaned_data) + action = ReviseAction(user=request.user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data) + + if settings.WIKI_ON: + if request.POST.get('wiki', False) and not answer.nis.wiki: + answer.nstate.wiki = action + elif answer.nis.wiki and (not request.POST.get('wiki', False)) and request.user.can_cancel_wiki(answer): + answer.nstate.wiki = None else: if not revision == answer.active_revision: - RollbackAction(user=request.user, node=answer).save(data=dict(activate=revision)) + RollbackAction(user=request.user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=dict(activate=revision)) return HttpResponseRedirect(answer.get_absolute_url()) else: revision_form = RevisionForm(answer) - form = EditAnswerForm(answer) + form = EditAnswerForm(answer, request.user) return render_to_response('answer_edit.html', { 'answer': answer, 'revision_form': revision_form, @@ -197,28 +215,55 @@ def edit_answer(request, id): 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.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_data'] = { + 'POST': request.POST, + 'data_name': _("answer"), + 'type': 'answer', + 'submission_url': reverse('answer', kwargs={'id': id}), + 'time': datetime.datetime.now() + } + if request.user.is_authenticated(): - data = { - "user_ip":request.META["REMOTE_ADDR"], - "user_agent":request.environ['HTTP_USER_AGENT'], - "comment_author":request.user.username, - "comment_author_email":request.user.email, - "comment_author_url":request.user.website, - "comment":request.POST['text'] - } - if Node.isSpam(request.POST['text'], data): - raise SpamNotAllowedException("answer") - - answer = AnswerAction(user=request.user).save(dict(question=question, **form.cleaned_data)).node - return HttpResponseRedirect(answer.get_absolute_url()) + 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: - 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'})) + 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_data', 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']) + +