Merging jambazov --> trunk.

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 80709e72059b5a54a28ed854051fd8ccb34b4fa5..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}),