X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/76fba9bd0ef9997f92a32ada3b2543e685f98b20..30beae7541b44060bdd42b55fe525a1113452b55:/forum/views/readers.py

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 3efb554..a48c35b 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -97,7 +97,7 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
 
     answer_count = Answer.objects.filter(deleted=None, parent__in=questions).count()   
     answer_description = _("answers")
-    
+
     return {
         "questions" : questions,
         "questions_count" : questions.count(),
@@ -108,6 +108,7 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
         "answer_description": answer_description,
         "base_path" : base_path,
         "page_title" : page_title,
+        "tab" : "questions",
         }
 
 
@@ -127,13 +128,9 @@ def search(request):
     else:
         return render_to_response("search.html", context_instance=RequestContext(request))
 
-@decoratable
-def do_question_search(keywords):
-    return Question.objects.filter(Q(title__icontains=keywords) | Q(body__icontains=keywords))
-
 @decorators.render('questions.html')
 def question_search(request, keywords):
-    initial = do_question_search(keywords)
+    initial = Question.objects.search(keywords)
 
     return question_list(request, initial, _("questions matching '%(keywords)s'") % {'keywords': keywords},
             base_path="%s?t=question&q=%s" % (reverse('search'), django_urlquote(keywords)), sort=False)
@@ -234,7 +231,11 @@ def question(request, id, slug):
     if question.deleted and not request.user.can_view_deleted_post(question):
         raise Http404
 
-    answer_form = AnswerForm(question)
+    if request.POST:
+        answer_form = AnswerForm(question, request.POST)
+    else:
+        answer_form = AnswerForm(question)
+
     answers = request.user.get_visible_answers(question)
 
     if answers is not None: