merge hernani > trunk

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

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 3b3e90b5c951792f414a62529d63afee56ceeb6f..a5c5d704f817f926f28d5328842ed72ad02494e9 100644 (file)
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -4,8 +4,7 @@ import time, datetime, random
 import logging
 from django.core.files.storage import FileSystemStorage
 from django.shortcuts import render_to_response, get_object_or_404
 import logging
 from django.core.files.storage import FileSystemStorage
 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.http import HttpResponseRedirect, HttpResponse, Http404

 from django.template import RequestContext
 from django.utils.html import *
 from django.utils import simplejson
 from django.template import RequestContext
 from django.utils.html import *
 from django.utils import simplejson


@@ -14,11 +13,12 @@ from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
 
 from forum.actions import AskAction, AnswerAction, ReviseAction, RollbackAction, RetagAction
 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.forms import *
 from forum.models import *

-from forum.utils.forms import get_next_url
+from forum.forms import get_next_url
+from forum.utils import html

 
 

+from vars import PENDING_SUBMISSION_SESSION_ATTR

 
 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):


@@ -37,13 +37,16 @@ def upload(request):#ajax upload file to a question or answer
             raise UploadPermissionNotAuthorized()
 
         # check file type
             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))
 
         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)
         # check file size
         # byte
         size = storage.size(new_file_name)


@@ -64,34 +67,53 @@ def upload(request):#ajax upload file to a question or answer
 
     return HttpResponse(result, mimetype="application/xml")
 
 
     return HttpResponse(result, mimetype="application/xml")
 

-@decoratable

 def ask(request):
 def ask(request):

-    if request.POST and "text" in request.POST:
-        form = AskForm(request.POST)
-        if form.is_valid():
-            if request.user.is_authenticated():
-                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()
+    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():
+                        request.user.message_set.create(message=_("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,
     return render_to_response('ask.html', {
         'form' : form,

-        #'tags' : tags,
-        'email_validation_faq_url':reverse('faq') + '#validate',
+        'tab' : 'ask'

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

-@login_required

 def edit_question(request, id):
     question = get_object_or_404(Question, id=id)
 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)
         raise Http404
     if request.user.can_edit_post(question):
         return _edit_question(request, question)


@@ -123,13 +145,19 @@ def _edit_question(request, question):
         revision = question.revisions.get(revision=revision_form.cleaned_data['revision'])
 
         if 'select_revision' in request.POST:
         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:
         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():
 
         if not 'select_revision' in request.POST and form.is_valid():
             if form.has_changed():

-                ReviseAction(user=request.user, node=question, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data)
+                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))
             else:
                 if not revision == question.active_revision:
                     RollbackAction(user=request.user, node=question).save(data=dict(activate=revision))


@@ -137,7 +165,7 @@ def _edit_question(request, question):
             return HttpResponseRedirect(question.get_absolute_url())
     else:
         revision_form = RevisionForm(question)
             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,
 
     return render_to_response('question_edit.html', {
         'question': question,


@@ -146,7 +174,6 @@ def _edit_question(request, question):
         #'tags' : _get_tags_cache_json()
     }, context_instance=RequestContext(request))
 
         #'tags' : _get_tags_cache_json()
     }, 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):
 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):


@@ -160,13 +187,19 @@ def edit_answer(request, id):
         revision = answer.revisions.get(revision=revision_form.cleaned_data['revision'])
 
         if 'select_revision' in request.POST:
         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:
         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():
 
         if not 'select_revision' in request.POST and form.is_valid():
             if form.has_changed():

-                ReviseAction(user=request.user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data)
+                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))
             else:
                 if not revision == answer.active_revision:
                     RollbackAction(user=request.user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=dict(activate=revision))


@@ -175,27 +208,64 @@ def edit_answer(request, id):
 
     else:
         revision_form = RevisionForm(answer)
 
     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))
 
     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)
 def answer(request, id):
     question = get_object_or_404(Question, id=id)

+

     if request.POST:
     if request.POST:

-        form = AnswerForm(question, request.POST)
-        if form.is_valid():
+        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():
             if request.user.is_authenticated():

-                answer = AnswerAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(dict(question=question, **form.cleaned_data)).node
-                return HttpResponseRedirect(answer.get_absolute_url())
+                request.user.message_set.create(message=_("Your answer is pending until you %s.") % html.hyperlink(
+                    reverse('send_validation_email'), _("validate your email")
+                ))
+                return HttpResponseRedirect(question.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(reverse('auth_signin'))

 
     return HttpResponseRedirect(question.get_absolute_url())
 
 
     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'])
+
+