X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0f2d00f9d7d5d28149707f66c719b28edfe51aed..0cf194935edb17d2c9288e4c4e5344a1775bcb5d:/forum/views/writers.py?ds=inline
diff --git a/forum/views/writers.py b/forum/views/writers.py
index 70be5ee..5bddc60 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,34 @@ 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:
+ if request.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)
+ question = AskAction(user=request.user, ip=request.META['REMOTE_ADDR']).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()
- tags = _get_tags_cache_json()
+ #tags = _get_tags_cache_json()
return render_to_response('ask.html', {
'form' : form,
- 'tags' : tags,
+ #'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 +105,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:
@@ -152,7 +113,7 @@ def _retag_question(request, question):
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):
@@ -168,20 +129,10 @@ def _edit_question(request, question):
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()
-
+ ReviseAction(user=request.user, node=question, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data)
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:
@@ -192,7 +143,7 @@ def _edit_question(request, question):
'question': question,
'revision_form': revision_form,
'form' : form,
- 'tags' : _get_tags_cache_json()
+ #'tags' : _get_tags_cache_json()
}, context_instance=RequestContext(request))
@login_required
@@ -215,18 +166,10 @@ def edit_answer(request, id):
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()
-
+ ReviseAction(user=request.user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data)
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())
@@ -239,15 +182,23 @@ 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.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 = AnswerAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(dict(question=question, **form.cleaned_data)).node
+ 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())