enabling the CSRF protection middleware and adding the {% csrf_token %} tag to the...

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index cad081a83f621363c8b01a3621274a0901d20a5a..e8004875018ed889d23cad8b419482d808fc46d6 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -10,6 +10,7 @@ from django.template import RequestContext
 from django import template
 from django.utils.html import *
 from django.utils import simplejson
 from django import template
 from django.utils.html import *
 from django.utils import simplejson

+from django.utils.encoding import smart_unicode

 from django.db.models import Q, Count
 from django.utils.translation import ugettext as _
 from django.template.defaultfilters import slugify
 from django.db.models import Q, Count
 from django.utils.translation import ugettext as _
 from django.template.defaultfilters import slugify


@@ -106,8 +107,20 @@ def tag(request, tag):
     except Tag.DoesNotExist:
         raise Http404
 
     except Tag.DoesNotExist:
         raise Http404
 

+    # Getting the questions QuerySet
+    questions = Question.objects.filter(tags__id=tag.id)
+
+    if request.method == "GET":
+        user = request.GET.get('user', None)
+
+        if user is not None:
+            try:
+                questions = questions.filter(author=User.objects.get(username=user))
+            except User.DoesNotExist:
+                raise Http404
+

     return question_list(request,
     return question_list(request,

-                         Question.objects.filter(tags=tag),
+                         questions,

                          mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
                          None,
                          mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),
                          mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
                          None,
                          mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),