Fix problem with dummy actions. Also try coercion of settings to the same type as...

[osqa.git] / forum / views / writers.py

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 70be5eee420ae33f8a78aa034516a15da3e60516..980357e3531442f93d0012bb7687a81adcfdb9a1 100644 (file)
--- 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 django.core.urlresolvers import reverse
 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.forms import *
 from forum.models import *

-from forum.const import *

 from forum.utils.forms import get_next_url
 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.views.commands import SpamNotAllowedException
+

 
 def upload(request):#ajax upload file to a question or answer
     class FileTypeNotAllow(Exception):
 
 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
 
     class UploadPermissionNotAuthorized(Exception):
         pass
 

-    #<result><msg><![CDATA[%s]]></msg><error><![CDATA[%s]]></error><file_url>%s</file_url></result>

     xml_template = "<result><msg><![CDATA[%s]]></msg><error><![CDATA[%s]]></error><file_url>%s</file_url></result>"
 
     try:
     xml_template = "<result><msg><![CDATA[%s]]></msg><error><![CDATA[%s]]></error><file_url>%s</file_url></result>"
 
     try:


@@ -76,46 +65,37 @@ def upload(request):#ajax upload file to a question or answer
     return HttpResponse(result, mimetype="application/xml")
 
 
     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):
 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():
         form = AskForm(request.POST)
         if form.is_valid():
             if request.user.is_authenticated():

-                return _create_post(request, Question, form)
+                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:
             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()
 
                 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,
     return render_to_response('ask.html', {
         'form' : form,

-        'tags' : tags,
+        #'tags' : tags,

         'email_validation_faq_url':reverse('faq') + '#validate',
         }, context_instance=RequestContext(request))
 
         'email_validation_faq_url':reverse('faq') + '#validate',
         }, context_instance=RequestContext(request))
 


@@ -136,15 +116,7 @@ def _retag_question(request, question):
         form = RetagQuestionForm(question, request.POST)
         if form.is_valid():
             if form.has_changed():
         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).save(data=dict(tagnames=form.cleaned_data['tags']))

 
             return HttpResponseRedirect(question.get_absolute_url())
     else:
 
             return HttpResponseRedirect(question.get_absolute_url())
     else:


@@ -152,7 +124,7 @@ def _retag_question(request, question):
     return render_to_response('question_retag.html', {
         'question': question,
         'form' : form,
     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):
     }, context_instance=RequestContext(request))
 
 def _edit_question(request, question):


@@ -168,20 +140,10 @@ def _edit_question(request, question):
 
         if not 'select_revision' in request.POST and form.is_valid():
             if form.has_changed():
 
         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).save(data=form.cleaned_data)

             else:
                 if not revision == question.active_revision:
             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:
 
             return HttpResponseRedirect(question.get_absolute_url())
     else:


@@ -192,7 +154,7 @@ def _edit_question(request, question):
         'question': question,
         'revision_form': revision_form,
         'form' : form,
         'question': question,
         'revision_form': revision_form,
         'form' : form,

-        'tags' : _get_tags_cache_json()
+        #'tags' : _get_tags_cache_json()

     }, context_instance=RequestContext(request))
 
 @login_required
     }, context_instance=RequestContext(request))
 
 @login_required


@@ -215,18 +177,10 @@ def edit_answer(request, id):
 
         if not 'select_revision' in request.POST and form.is_valid():
             if form.has_changed():
 
         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).save(data=form.cleaned_data)

             else:
                 if not revision == answer.active_revision:
             else:
                 if not revision == answer.active_revision:

-                    answer.activate_revision(request.user, revision)
+                    RollbackAction(user=request.user, node=answer).save(data=dict(activate=revision))

 
             return HttpResponseRedirect(answer.get_absolute_url())
 
 
             return HttpResponseRedirect(answer.get_absolute_url())
 


@@ -241,12 +195,27 @@ def edit_answer(request, id):
 
 def answer(request, id):
     question = get_object_or_404(Question, id=id)
 
 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():
         form = AnswerForm(question, request.POST)
         if form.is_valid():
             if request.user.is_authenticated():

-                return _create_post(request, Answer, form, question)
+                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())

             else:
             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(question.get_absolute_url())
                 return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'}))
 
     return HttpResponseRedirect(question.get_absolute_url())