Merge pull request #44 from udacity/merge_small_prs

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

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 8e9c5446845011fc7647366fa16887321e7f3050..304032c52d33f4f992a89c38b305ba15f0474e17 100644 (file)
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -1,26 +1,28 @@
 # encoding:utf-8
 import os.path
 # 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.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.shortcuts import render_to_response, get_object_or_404

-from django.http import HttpResponseRedirect, HttpResponse, Http404

 from django.template import RequestContext
 from django.template import RequestContext

+from django.http import HttpResponseRedirect, HttpResponse, Http404

 from django.utils.html import *
 from django.utils.html import *

-from django.utils import simplejson

 from django.utils.translation import ugettext as _
 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.actions import AskAction, AnswerAction, ReviseAction, RollbackAction, RetagAction, AnswerToQuestionAction, CommentToQuestionAction
 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
 
 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
 def upload(request):#ajax upload file to a question or answer
     class FileTypeNotAllow(Exception):
         pass


@@ -95,7 +97,7 @@ def ask(request):
                     }
 
                     if request.user.is_authenticated():
                     }
 
                     if request.user.is_authenticated():

-                        request.user.message_set.create(message=_("Your question is pending until you %s.") % html.hyperlink(
+                        messages.info(request, _("Your question is pending until you %s.") % html.hyperlink(

                             reverse('send_validation_email'), _("validate your email")
                         ))
                         return HttpResponseRedirect(reverse('index'))
                             reverse('send_validation_email'), _("validate your email")
                         ))
                         return HttpResponseRedirect(reverse('index'))


@@ -156,7 +158,8 @@ 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, template='question_edit.html', summary='', action_class=ReviseAction, allow_rollback=True, url_getter=lambda q: q.get_absolute_url()):
+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()
     if request.method == 'POST':
         revision_form = RevisionForm(question, data=request.POST)
         revision_form.is_valid()


@@ -188,11 +191,16 @@ def _edit_question(request, question, template='question_edit.html', summary='',
         revision_form = RevisionForm(question)
         form = EditQuestionForm(question, request.user, initial={'summary': summary})
 
         revision_form = RevisionForm(question)
         form = EditQuestionForm(question, request.user, initial={'summary': summary})
 

-    return render_to_response(template, {
+    context = {

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

-    }, context_instance=RequestContext(request))
+    }
+
+    if not (additional_context is None):
+        context.update(additional_context)
+
+    return render_to_response(template, context, context_instance=RequestContext(request))

 
 
 def edit_answer(request, id):
 
 
 def edit_answer(request, id):


@@ -264,7 +272,7 @@ def answer(request, id):
             }
 
             if request.user.is_authenticated():
             }
 
             if request.user.is_authenticated():

-                request.user.message_set.create(message=_("Your answer is pending until you %s.") % html.hyperlink(
+                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())
                     reverse('send_validation_email'), _("validate your email")
                 ))
                 return HttpResponseRedirect(question.get_absolute_url())