X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7f5e25a1b44bd8ad23ecb5d8194306b319998a72..dcacc3b4c2ba2f550806a2d22b183f6fac4f63ff:/forum/views/writers.py?ds=sidebyside
diff --git a/forum/views/writers.py b/forum/views/writers.py
index e2143a8..304032c 100644
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -1,35 +1,28 @@
# encoding:utf-8
import os.path
-import time, datetime, random
-import logging
+
+import datetime
+
+from django.core.urlresolvers import reverse
from django.core.files.storage import FileSystemStorage
+from django.views.decorators.csrf import csrf_exempt
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.template import RequestContext
+from django.http import HttpResponseRedirect, HttpResponse, Http404
from django.utils.html import *
-from django.utils import simplejson
from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
-from django.core.exceptions import PermissionDenied
+from django.contrib import messages
+
+from forum.actions import AskAction, AnswerAction, ReviseAction, RollbackAction, RetagAction, AnswerToQuestionAction, CommentToQuestionAction
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
+from forum.utils import html
+from forum.http_responses import HttpResponseUnauthorized
+
+from vars import PENDING_SUBMISSION_SESSION_ATTR
+@csrf_exempt
def upload(request):#ajax upload file to a question or answer
class FileTypeNotAllow(Exception):
pass
@@ -38,7 +31,6 @@ def upload(request):#ajax upload file to a question or answer
class UploadPermissionNotAuthorized(Exception):
pass
- #%s
xml_template = "%s"
try:
@@ -48,13 +40,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)
@@ -75,54 +70,70 @@ 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())
-
-
-
def ask(request):
- if request.method == "POST" and "text" in request.POST:
- form = AskForm(request.POST)
- if form.is_valid():
- if request.user.is_authenticated():
- return _create_post(request, Question, form)
- else:
- 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_SESSION_ATTR] = {
+ 'POST': request.POST,
+ 'data_name': _("question"),
+ 'type': 'ask',
+ 'submission_url': reverse('ask'),
+ 'time': datetime.datetime.now()
+ }
+
+ if request.user.is_authenticated():
+ messages.info(request, _("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
+
+ 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.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 +147,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:
@@ -155,47 +158,51 @@ 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(), additional_context=None):
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:
- 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 = 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:
+ 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)
+ 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)
+ form = EditQuestionForm(question, request.user, initial={'summary': summary})
- return render_to_response('question_edit.html', {
+ context = {
'question': question,
'revision_form': revision_form,
'form' : form,
- #'tags' : _get_tags_cache_json()
- }, context_instance=RequestContext(request))
+ }
+
+ if not (additional_context is None):
+ context.update(additional_context)
+
+ return render_to_response(template, context, 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):
@@ -209,30 +216,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():
- 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,
@@ -241,13 +246,55 @@ def edit_answer(request, id):
def answer(request, id):
question = get_object_or_404(Question, id=id)
- if request.method == "POST":
- form = AnswerForm(question, request.POST)
- if form.is_valid():
+
+ if 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
+ 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():
- return _create_post(request, Answer, form, question)
+ messages.info(request, _("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_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_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'])
+
+