OSQA-143, fixing text overflow issue under IE8, added max-width to the paragraphs...

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

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 017914b793727c2465ae941d2d26b347c1ec0260..5064757aad706e349c8706669036edfcb997d98b 100644 (file)
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -12,12 +12,14 @@ 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.actions import AskAction, AnswerAction, ReviseAction, RollbackAction, RetagAction, AnswerToQuestionAction

 from forum.forms import *
 from forum.models import *
 from forum.forms import get_next_url
 from forum.utils import html
 from forum.forms import *
 from forum.models import *
 from forum.forms import get_next_url
 from forum.utils import html

+from forum.http_responses import HttpResponseUnauthorized

 
 

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


@@ -84,7 +86,7 @@ def ask(request):
 
                     return HttpResponseRedirect(question.get_absolute_url())
                 else:
 
                     return HttpResponseRedirect(question.get_absolute_url())
                 else:

-                    request.session['pending_submission_data'] = {
+                    request.session[PENDING_SUBMISSION_SESSION_ATTR] = {

                         'POST': request.POST,
                         'data_name': _("question"),
                         'type': 'ask',
                         'POST': request.POST,
                         'data_name': _("question"),
                         'type': 'ask',


@@ -107,20 +109,21 @@ def ask(request):
 
     return render_to_response('ask.html', {
         'form' : form,
 
     return render_to_response('ask.html', {
         'form' : form,

+        'tab' : 'ask'

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

-def edit_question(request, id):
-    #question = get_object_or_404(Question, id=id)
-    try:
-        question = Question.objects.get(id=id)
-    except:
-        if slug:
-            question = match_question_slug(slug)
-            if question is not None:
-                return HttpResponseRedirect(question.get_absolute_url())
+def convert_to_question(request, id):
+    user = request.user
+    answer = get_object_or_404(Answer, id=id)
+
+    if not user.can_convert_to_question(answer):
+        return HttpResponseUnauthorized(request)

 
 

-        raise Http404()
+    return _edit_question(request, answer, template='node/convert_to_question.html', summary=_("Converted to question"),
+                           action_class=AnswerToQuestionAction, 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.nis.deleted and not request.user.can_view_deleted_post(question):
         raise Http404
     if request.user.can_edit_post(question):
     if question.nis.deleted and not request.user.can_view_deleted_post(question):
         raise Http404
     if request.user.can_edit_post(question):


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

     if request.method == 'POST':
         revision_form = RevisionForm(question, data=request.POST)
         revision_form.is_valid()
     if request.method == 'POST':
         revision_form = RevisionForm(question, data=request.POST)
         revision_form.is_valid()


@@ -159,7 +162,7 @@ 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():

-                action = ReviseAction(user=request.user, node=question, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data)
+                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:
 
                 if settings.WIKI_ON:
                     if request.POST.get('wiki', False) and not question.nis.wiki:


@@ -168,20 +171,23 @@ def _edit_question(request, question):
                         question.nstate.wiki = None
             else:
                 if not revision == question.active_revision:
                         question.nstate.wiki = None
             else:
                 if not revision == question.active_revision:

-                    RollbackAction(user=request.user, node=question).save(data=dict(activate=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)
     else:
         revision_form = RevisionForm(question)

-        form = EditQuestionForm(question, request.user)
+        form = EditQuestionForm(question, request.user, initial={'summary': summary})

 
 

-    return render_to_response('question_edit.html', {
+    return render_to_response(template, {

         'question': question,
         'revision_form': revision_form,
         'form' : form,
         'question': question,
         'revision_form': revision_form,
         'form' : form,

-        #'tags' : _get_tags_cache_json()

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

+

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


@@ -227,7 +233,7 @@ def answer(request, id):
     question = get_object_or_404(Question, id=id)
 
     if request.POST:
     question = get_object_or_404(Question, id=id)
 
     if request.POST:

-        form = AnswerForm(question, 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
 
         if request.session.pop('reviewing_pending_data', False) or not form.is_valid():
             request.session['redirect_POST_data'] = request.POST


@@ -242,7 +248,7 @@ def answer(request, id):
 
             return HttpResponseRedirect(answer.get_absolute_url())
         else:
 
             return HttpResponseRedirect(answer.get_absolute_url())
         else:

-            request.session['pending_submission_data'] = {
+            request.session[PENDING_SUBMISSION_SESSION_ATTR] = {

                 'POST': request.POST,
                 'data_name': _("answer"),
                 'type': 'answer',
                 'POST': request.POST,
                 'data_name': _("answer"),
                 'type': 'answer',


@@ -262,7 +268,7 @@ def answer(request, id):
 
 
 def manage_pending_data(request, action, forward=None):
 
 
 def manage_pending_data(request, action, forward=None):

-    pending_data = request.session.pop('pending_submission_data', None)
+    pending_data = request.session.pop(PENDING_SUBMISSION_SESSION_ATTR, None)

 
     if not pending_data:
         raise Http404
 
     if not pending_data:
         raise Http404