OSQA-587, filtering the questions QuerySet on the tag view if there is user parameter...

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 991a6b65bec77d17b156338ce723838a3599b6b1..0ef481ec4b8ccdc398c0ad84c0e8facb76118a06 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -6,7 +6,6 @@ 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.template import RequestContext
 from django import template
 from django.utils.html import *


@@ -102,15 +101,25 @@ def questions(request):
 
 @decorators.render('questions.html')
 def tag(request, tag):
 
 @decorators.render('questions.html')
 def tag(request, tag):

-

     try:
         tag = Tag.active.get(name=unquote(tag))
     except Tag.DoesNotExist:
         raise Http404
 
     try:
         tag = Tag.active.get(name=unquote(tag))
     except Tag.DoesNotExist:
         raise Http404
 

+    # Getting the questions QuerySet
+    questions = Question.objects.filter(tags=tag)
+
+    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}),


@@ -216,11 +225,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)