X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..fe388980b431aef835eaf43f4547e51f763c3f4b:/forum/views/writers.py diff --git a/forum/views/writers.py b/forum/views/writers.py index f65c4f4..b6e13af 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -13,26 +13,12 @@ from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse from django.core.exceptions import PermissionDenied -from forum.utils.html import sanitize_html -from markdown2 import Markdown +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 - -markdowner = Markdown(html4tags=True) def upload(request):#ajax upload file to a question or answer class FileTypeNotAllow(Exception): @@ -42,7 +28,6 @@ def upload(request):#ajax upload file to a question or answer class UploadPermissionNotAuthorized(Exception): pass - #%s xml_template = "%s" try: @@ -79,67 +64,37 @@ def upload(request):#ajax upload file to a question or answer return HttpResponse(result, mimetype="application/xml") - +@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(): - - added_at = datetime.datetime.now() - title = strip_tags(form.cleaned_data['title'].strip()) - wiki = form.cleaned_data['wiki'] - tagnames = form.cleaned_data['tags'].strip() - text = form.cleaned_data['text'] - html = sanitize_html(markdowner.convert(text)) - summary = strip_tags(html)[:120] - if request.user.is_authenticated(): - author = request.user - - question = Question.objects.create_new( - title = title, - author = author, - added_at = added_at, - wiki = wiki, - tagnames = tagnames, - summary = summary, - text = sanitize_html(markdowner.convert(text)) - ) + 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.flush() - session_key = request.session.session_key - question = AnonymousQuestion( - session_key = session_key, - title = title, - tagnames = tagnames, - wiki = wiki, - text = text, - summary = summary, - added_at = added_at, - ip_addr = request.META['REMOTE_ADDR'], - ) - question.save() + 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):#edit or retag a question - """view to edit question - """ +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) @@ -148,34 +103,12 @@ def edit_question(request, id):#edit or retag a question else: raise Http404 -def _retag_question(request, question):#non-url subview of edit question - just retag - """retag question sub-view used by - view "edit_question" - """ +def _retag_question(request, question): if request.method == 'POST': form = RetagQuestionForm(question, request.POST) if form.is_valid(): if form.has_changed(): - latest_revision = question.get_latest_revision() - retagged_at = datetime.datetime.now() - - question.tagnames = form.cleaned_data['tags'] - question.last_edited_at = retagged_at - question.last_edited_by = request.user - question.last_activity_at = retagged_at - question.last_activity_by = request.user - question.save() - - # Create a new revision - QuestionRevision.objects.create( - question = question, - title = latest_revision.title, - author = request.user, - revised_at = retagged_at, - tagnames = form.cleaned_data['tags'], - summary = CONST['retagged'], - text = latest_revision.text - ) + 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: @@ -183,78 +116,43 @@ def _retag_question(request, question):#non-url subview of edit question - just return render_to_response('question_retag.html', { 'question': question, 'form' : form, - 'tags' : _get_tags_cache_json(), + #'tags' : _get_tags_cache_json(), }, context_instance=RequestContext(request)) -def _edit_question(request, question):#non-url subview of edit_question - just edit the body/title - latest_revision = question.get_latest_revision() - revision_form = None +def _edit_question(request, question): if request.method == 'POST': + revision_form = RevisionForm(question, data=request.POST) + revision_form.is_valid() + revision = question.revisions.get(revision=revision_form.cleaned_data['revision']) + if 'select_revision' in request.POST: - # user has changed revistion number - revision_form = RevisionForm(question, latest_revision, request.POST) - if revision_form.is_valid(): - # Replace with those from the selected revision - form = EditQuestionForm(question, - QuestionRevision.objects.get(question=question, - revision=revision_form.cleaned_data['revision'])) - else: - form = EditQuestionForm(question, latest_revision, request.POST) + form = EditQuestionForm(question, request.user, revision) else: - # Always check modifications against the latest revision - form = EditQuestionForm(question, latest_revision, request.POST) - if form.is_valid(): - html = sanitize_html(markdowner.convert(form.cleaned_data['text'])) - if form.has_changed(): - edited_at = datetime.datetime.now() - tags_changed = (latest_revision.tagnames != - form.cleaned_data['tags']) - - # Update the Question itself - question.title = form.cleaned_data['title'] - question.last_edited_at = edited_at - question.last_edited_by = request.user - question.last_activity_at = edited_at - question.last_activity_by = request.user - question.tagnames = form.cleaned_data['tags'] - question.summary = strip_tags(html)[:120] - question.html = html - - # only save when it's checked - # because wiki doesn't allow to be edited if last version has been enabled already - # and we make sure this in forms. - if ('wiki' in form.cleaned_data and - form.cleaned_data['wiki']): - question.wiki = True - question.wikified_at = edited_at - - question.save() - - # Create a new revision - revision = QuestionRevision( - question = question, - title = form.cleaned_data['title'], - author = request.user, - revised_at = edited_at, - tagnames = form.cleaned_data['tags'], - text = form.cleaned_data['text'], - ) - if form.cleaned_data['summary']: - revision.summary = form.cleaned_data['summary'] - else: - revision.summary = 'No.%s Revision' % latest_revision.revision - revision.save() + form = EditQuestionForm(question, request.user, revision, data=request.POST) - return HttpResponseRedirect(question.get_absolute_url()) + 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) + + 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)) + + return HttpResponseRedirect(question.get_absolute_url()) else: + revision_form = RevisionForm(question) + form = EditQuestionForm(question, request.user) - revision_form = RevisionForm(question, latest_revision) - form = EditQuestionForm(question, latest_revision) return render_to_response('question_edit.html', { 'question': question, 'revision_form': revision_form, 'form' : form, - 'tags' : _get_tags_cache_json() + #'tags' : _get_tags_cache_json() }, context_instance=RequestContext(request)) @login_required @@ -264,91 +162,63 @@ def edit_answer(request, id): raise Http404 elif not request.user.can_edit_post(answer): raise Http404 - else: - latest_revision = answer.get_latest_revision() - if request.method == "POST": - if 'select_revision' in request.POST: - # user has changed revistion number - revision_form = RevisionForm(answer, latest_revision, request.POST) - if revision_form.is_valid(): - # Replace with those from the selected revision - form = EditAnswerForm(answer, - AnswerRevision.objects.get(answer=answer, - revision=revision_form.cleaned_data['revision'])) - else: - form = EditAnswerForm(answer, latest_revision, request.POST) - else: - form = EditAnswerForm(answer, latest_revision, request.POST) - if form.is_valid(): - html = sanitize_html(markdowner.convert(form.cleaned_data['text'])) - if form.has_changed(): - edited_at = datetime.datetime.now() - updated_fields = { - 'last_edited_at': edited_at, - 'last_edited_by': request.user, - 'html': html, - } - Answer.objects.filter(id=answer.id).update(**updated_fields) - - revision = AnswerRevision( - answer=answer, - author=request.user, - revised_at=edited_at, - text=form.cleaned_data['text'] - ) - - if form.cleaned_data['summary']: - revision.summary = form.cleaned_data['summary'] - else: - revision.summary = 'No.%s Revision' % latest_revision.revision - revision.save() - - answer.question.last_activity_at = edited_at - answer.question.last_activity_by = request.user - answer.question.save() - - return HttpResponseRedirect(answer.get_absolute_url()) + + if request.method == "POST": + revision_form = RevisionForm(answer, data=request.POST) + revision_form.is_valid() + revision = answer.revisions.get(revision=revision_form.cleaned_data['revision']) + + if 'select_revision' in request.POST: + form = EditAnswerForm(answer, request.user, revision) else: - revision_form = RevisionForm(answer, latest_revision) - form = EditAnswerForm(answer, latest_revision) - return render_to_response('answer_edit.html', { - 'answer': answer, - 'revision_form': revision_form, - 'form': form, - }, context_instance=RequestContext(request)) - -def answer(request, id):#process a new answer + form = EditAnswerForm(answer, request.user, revision, data=request.POST) + + if not 'select_revision' in request.POST and form.is_valid(): + if form.has_changed(): + 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, ip=request.META['REMOTE_ADDR']).save(data=dict(activate=revision)) + + return HttpResponseRedirect(answer.get_absolute_url()) + + else: + revision_form = RevisionForm(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": - form = AnswerForm(question, request.user, request.POST) + if request.POST: + form = AnswerForm(question, request.POST) if form.is_valid(): - wiki = form.cleaned_data['wiki'] - text = form.cleaned_data['text'] - update_time = datetime.datetime.now() - if request.user.is_authenticated(): - Answer.objects.create_new( - question=question, - author=request.user, - added_at=update_time, - wiki=wiki, - text=sanitize_html(markdowner.convert(text)), - email_notify=form.cleaned_data['email_notify'] - ) + 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.flush() - html = sanitize_html(markdowner.convert(text)) - summary = strip_tags(html)[:120] - anon = AnonymousAnswer( - question=question, - wiki=wiki, - text=text, - summary=summary, - session_key=request.session.session_key, - ip_addr=request.META['REMOTE_ADDR'], - ) - anon.save() - return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newanswer'})) + 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())