X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/13bee2f2e6aea2d936909861f3ab60bb09821a60..5737916435bfeaec27dfd64af918bd8c7ae6ac0f:/forum/views/readers.py

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 9a6f66e..e800487 100644
--- 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.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.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
@@ -102,11 +102,23 @@ def questions(request):
 
 @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
 
+    # 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}),
@@ -214,11 +226,14 @@ def question_search(request, keywords):
     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},
-                         paginator_context=paginator_context)
+                         paginator_context=paginator_context,
+                         feed_url=feed_url)
 
 
 @decorators.render('tags.html', 'tags', _('tags'), weight=100)
@@ -238,16 +253,14 @@ def tags(request):
     })
 
 def update_question_view_times(request, question):
-    if not 'last_seen_in_question' in request.session:
-        request.session['last_seen_in_question'] = {}
+    last_seen_in_question = request.session.get('last_seen_in_question', {})
 
-    last_seen = request.session['last_seen_in_question'].get(question.id, None)
+    last_seen = last_seen_in_question.get(question.id, None)
 
-    if (not last_seen) or last_seen < question.last_activity_at:
+    if (not last_seen) or (last_seen < question.last_activity_at):
         QuestionViewAction(question, request.user, ip=request.META['REMOTE_ADDR']).save()
-        request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
-
-    request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
+        last_seen_in_question[question.id] = datetime.datetime.now()
+        request.session['last_seen_in_question'] = last_seen_in_question
 
 def match_question_slug(id, slug):
     slug_words = slug.split('-')