Fixes OSQA 337, We show too many tags on the /questions/ url, by adding a couple...

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

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 99e93775015f28b84b9902ee2c441d3effd9726a..c7dbbf39117607807dc338ad5ca1c11835ff0a2b 100644 (file)
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -5,7 +5,7 @@ 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.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


@@ -17,7 +17,7 @@ from forum.actions import AskAction, AnswerAction, ReviseAction, RollbackAction,
 from forum.modules.decorators import decoratable
 from forum.forms import *
 from forum.models import *
 from forum.modules.decorators import decoratable
 from forum.forms import *
 from forum.models import *

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

 
 
 def upload(request):#ajax upload file to a question or answer
 
 
 def upload(request):#ajax upload file to a question or answer


@@ -67,7 +67,7 @@ def upload(request):#ajax upload file to a question or answer
 @decoratable
 def ask(request):
     if request.POST and "text" in request.POST:
 @decoratable
 def ask(request):
     if request.POST and "text" in request.POST:

-        form = AskForm(request.POST)
+        form = AskForm(request.POST, user=request.user)

         if form.is_valid():
             if request.user.is_authenticated():
                 ask_action = AskAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data)
         if form.is_valid():
             if request.user.is_authenticated():
                 ask_action = AskAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=form.cleaned_data)


@@ -82,14 +82,12 @@ def ask(request):
                 request.session['temp_node_type'] = 'question'
                 return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'}))
     elif request.method == "POST" and "go" in 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']})
+        form = AskForm({'title': request.POST['q']}, user=request.user)

     else:
     else:

-        form = AskForm()
+        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',
         }, context_instance=RequestContext(request))
 
         'email_validation_faq_url':reverse('faq') + '#validate',
         }, context_instance=RequestContext(request))