X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7f5e25a1b44bd8ad23ecb5d8194306b319998a72..fe388980b431aef835eaf43f4547e51f763c3f4b:/forum/views/writers.py diff --git a/forum/views/writers.py b/forum/views/writers.py index e2143a8..b6e13af 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -13,22 +13,12 @@ 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.forms import * from forum.models import * -from forum.const import * from forum.utils.forms import get_next_url -from forum.views.readers import _get_tags_cache_json - -# used in index page -INDEX_PAGE_SIZE = 20 -INDEX_AWARD_SIZE = 15 -INDEX_TAGS_SIZE = 100 -# used in tags list -DEFAULT_PAGE_SIZE = 60 -# used in questions -QUESTIONS_PAGE_SIZE = 10 -# used in answers -ANSWERS_PAGE_SIZE = 10 + def upload(request):#ajax upload file to a question or answer class FileTypeNotAllow(Exception): @@ -38,7 +28,6 @@ def upload(request):#ajax upload file to a question or answer class UploadPermissionNotAuthorized(Exception): pass - #%s xml_template = "%s" try: @@ -75,54 +64,37 @@ def upload(request):#ajax upload file to a question or answer return HttpResponse(result, mimetype="application/xml") - -def _create_post(request, post_cls, form, parent=None): - post = post_cls() - - if parent is not None: - post.parent = parent - - revision_data = dict(summary=_('Initial revision'), body=form.cleaned_data['text']) - - if form.cleaned_data.get('title', None): - revision_data['title'] = strip_tags(form.cleaned_data['title'].strip()) - - if form.cleaned_data.get('tags', None): - revision_data['tagnames'] = form.cleaned_data['tags'].strip() - - post.create_revision(request.user, **revision_data) - - if form.cleaned_data['wiki']: - post.wikify() - - return HttpResponseRedirect(post.get_absolute_url()) - - - +@decoratable def ask(request): - if request.method == "POST" and "text" in request.POST: - form = AskForm(request.POST) + if request.POST and "text" in request.POST: + form = AskForm(request.POST, user=request.user) if form.is_valid(): if request.user.is_authenticated(): - return _create_post(request, Question, form) + 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['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']}) + form = AskForm({'title': request.POST['q']}, user=request.user) else: - form = AskForm() + 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) @@ -136,15 +108,7 @@ def _retag_question(request, question): form = RetagQuestionForm(question, request.POST) if form.is_valid(): if form.has_changed(): - active = question.active_revision - - question.create_revision( - request.user, - summary = _('Retag'), - title = active.title, - tagnames = form.cleaned_data['tags'], - body = active.body, - ) + 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: @@ -162,31 +126,27 @@ 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(): - question.create_revision( - request.user, - summary = form.cleaned_data['summary'], - title = strip_tags(form.cleaned_data['title'].strip()), - tagnames = form.cleaned_data['tags'].strip(), - body = form.cleaned_data['text'], - ) - - if form.cleaned_data.get('wiki', False): - question.wikify() + 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: - question.activate_revision(request.user, revision) + RollbackAction(user=request.user, node=question).save(data=dict(activate=revision)) 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, @@ -209,45 +169,56 @@ 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(): - answer.create_revision( - request.user, - summary = form.cleaned_data['summary'], - body = form.cleaned_data['text'], - ) - - if form.cleaned_data.get('wiki', False): - answer.wikify() + 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: - answer.activate_revision(request.user, 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, 'form': form, }, context_instance=RequestContext(request)) +@decoratable def answer(request, id): question = get_object_or_404(Question, id=id) - if request.method == "POST": + if request.POST: form = AnswerForm(question, request.POST) if form.is_valid(): if request.user.is_authenticated(): - return _create_post(request, Answer, form, question) + 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['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: + request.session['redirect_POST_data'] = request.POST + return HttpResponseRedirect(question.get_absolute_url() + '#fmanswer') return HttpResponseRedirect(question.get_absolute_url())