Reverting the merges due to unsuccessfull conflict resolvement.

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index e0929220b6b0dfa5d9f3a1967d71b0b18ba42b45..9a6f66eaf2caaa78ec8439ea4e8715cad8948201 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -6,6 +6,7 @@ from forum import settings as django_settings
 from django.shortcuts import render_to_response, get_object_or_404
 from django.http import HttpResponseRedirect, HttpResponse, Http404, HttpResponsePermanentRedirect
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
+from django.core.exceptions import ObjectDoesNotExist
 from django.template import RequestContext
 from django import template
 from django.utils.html import *
@@ -101,8 +102,13 @@ def questions(request):
 
 @decorators.render('questions.html')
 def tag(request, tag):
+    questions = Question.objects.filter(tags__name=unquote(tag))
+
+    if not questions:
+        raise Http404
+
     return question_list(request,
-                         Question.objects.filter(tags__name=unquote(tag)),
+                         questions,
                          mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
                          None,
                          mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),
@@ -192,7 +198,7 @@ def search(request):
             return HttpResponseRedirect(reverse('tags') + '?q=%s' % urlquote(keywords.strip()))
         elif search_type == "user":
             return HttpResponseRedirect(reverse('users') + '?q=%s' % urlquote(keywords.strip()))
-        elif search_type == "question":
+        else:
             return question_search(request, keywords)
     else:
         return render_to_response("search.html", context_instance=RequestContext(request))
@@ -314,9 +320,9 @@ def question(request, id, slug='', answer=None):
         return HttpResponsePermanentRedirect(question.get_absolute_url())
 
     if request.POST:
-        answer_form = AnswerForm(question, request.POST)
+        answer_form = AnswerForm(request.POST, user=request.user)
     else:
-        answer_form = AnswerForm(question)
+        answer_form = AnswerForm(user=request.user)
 
     answers = request.user.get_visible_answers(question)