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 69edf3cfa9243df64602542f1ab8ec7af775ba33..e8004875018ed889d23cad8b419482d808fc46d6 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -6,11 +6,11 @@ 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.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 *
 from django.utils import simplejson
 from django.template import RequestContext
 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


@@ -102,11 +102,23 @@ def questions(request):
 
 @decorators.render('questions.html')
 def tag(request, tag):
 
 @decorators.render('questions.html')
 def tag(request, tag):

-    questions = Question.objects.filter(tags__name=unquote(tag))
-
-    if not questions:
+    try:
+        tag = Tag.active.get(name=unquote(tag))
+    except Tag.DoesNotExist:

         raise Http404
 
         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,
                          questions,
                          mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
     return question_list(request,
                          questions,
                          mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),


@@ -214,11 +226,14 @@ def question_search(request, keywords):
     else:
         paginator_context = None
 
     else:
         paginator_context = None
 

+    feed_url = mark_safe(escape(request.path + "?type=rss&q=" + keywords))
+

     return question_list(request, initial,
                          _("questions matching '%(keywords)s'") % {'keywords': keywords},
                          None,
                          _("questions matching '%(keywords)s'") % {'keywords': keywords},
     return question_list(request, initial,
                          _("questions matching '%(keywords)s'") % {'keywords': keywords},
                          None,
                          _("questions matching '%(keywords)s'") % {'keywords': keywords},

-                         paginator_context=paginator_context)
+                         paginator_context=paginator_context,
+                         feed_url=feed_url)

 
 
 @decorators.render('tags.html', 'tags', _('tags'), weight=100)
 
 
 @decorators.render('tags.html', 'tags', _('tags'), weight=100)