Fixes small bug with rss feed url generation.

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 1c4dfcc2bcf48cfcc2319d5519778bac22f7dc22..5989dcddbcbd1dde5eaa94d4eddb1d93d4788a16 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


@@ -29,6 +30,7 @@ from forum.forms import get_next_url
 from forum.actions import QuestionViewAction
 from forum.http_responses import HttpResponseUnauthorized
 from forum.feed import RssQuestionFeed, RssAnswerFeed
 from forum.actions import QuestionViewAction
 from forum.http_responses import HttpResponseUnauthorized
 from forum.feed import RssQuestionFeed, RssAnswerFeed

+from forum.utils.pagination import generate_uri

 import decorators
 
 class HottestQuestionsSort(pagination.SortBase):
 import decorators
 
 class HottestQuestionsSort(pagination.SortBase):


@@ -76,7 +78,6 @@ def feed(request):
                 settings.APP_TITLE + _(' - ')+ _('latest questions'),
                 settings.APP_DESCRIPTION)(request)
 
                 settings.APP_TITLE + _(' - ')+ _('latest questions'),
                 settings.APP_DESCRIPTION)(request)
 

-

 @decorators.render('index.html')
 def index(request):
     paginator_context = QuestionListPaginatorContext()
 @decorators.render('index.html')
 def index(request):
     paginator_context = QuestionListPaginatorContext()


@@ -101,8 +102,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
+
+    # 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__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}),
                          mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
                          None,
                          mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),


@@ -163,11 +181,11 @@ def question_list(request, initial,
     #answer_description = _("answers")
 
     if not feed_url:
     #answer_description = _("answers")
 
     if not feed_url:

-        req_params = "&".join(["%s=%s" % (k, v) for k, v in request.GET.items() if not k in (_('page'), _('pagesize'), _('sort'))])
+        req_params = generate_uri(request.GET, (_('page'), _('pagesize'), _('sort')))

         if req_params:
             req_params = '&' + req_params
 
         if req_params:
             req_params = '&' + req_params
 

-        feed_url = mark_safe(request.path + "?type=rss" + req_params)
+        feed_url = request.path + "?type=rss" + req_params

 
     return pagination.paginated(request, ('questions', paginator_context or QuestionListPaginatorContext()), {
     "questions" : questions.distinct(),
 
     return pagination.paginated(request, ('questions', paginator_context or QuestionListPaginatorContext()), {
     "questions" : questions.distinct(),


@@ -192,7 +210,7 @@ def search(request):
             return HttpResponseRedirect(reverse('tags') + '?q=%s' % urlquote(keywords.strip()))
         elif search_type == "user":
             return HttpResponseRedirect(reverse('users') + '?q=%s' % urlquote(keywords.strip()))
             return HttpResponseRedirect(reverse('tags') + '?q=%s' % urlquote(keywords.strip()))
         elif search_type == "user":
             return HttpResponseRedirect(reverse('users') + '?q=%s' % urlquote(keywords.strip()))

-        elif search_type == "question":
+        else:

             return question_search(request, keywords)
     else:
         return render_to_response("search.html", context_instance=RequestContext(request))
             return question_search(request, keywords)
     else:
         return render_to_response("search.html", context_instance=RequestContext(request))


@@ -208,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)


@@ -223,7 +244,7 @@ def tags(request):
     if request.method == "GET":
         stag = request.GET.get("q", "").strip()
         if stag:
     if request.method == "GET":
         stag = request.GET.get("q", "").strip()
         if stag:

-            tags = tags.filter(name__contains=stag)
+            tags = tags.filter(name__icontains=stag)

 
     return pagination.paginated(request, ('tags', TagPaginatorContext()), {
         "tags" : tags,
 
     return pagination.paginated(request, ('tags', TagPaginatorContext()), {
         "tags" : tags,


@@ -232,18 +253,16 @@ def tags(request):
     })
 
 def update_question_view_times(request, question):
     })
 
 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()
         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(slug):
+def match_question_slug(id, slug):

     slug_words = slug.split('-')
     qs = Question.objects.filter(title__istartswith=slug_words[0])
 
     slug_words = slug.split('-')
     qs = Question.objects.filter(title__istartswith=slug_words[0])
 


@@ -267,7 +286,7 @@ def answer_redirect(request, answer):
     else:
         raise Http404()
 
     else:
         raise Http404()
 

-    count = answer.question.answers.filter(Q(marked=True) | filter).count()
+    count = answer.question.answers.filter(Q(marked=True) | filter).exclude(state_string="(deleted)").count()

     pagesize = pc.pagesize(request)
 
     page = count / pagesize
     pagesize = pc.pagesize(request)
 
     page = count / pagesize


@@ -287,7 +306,7 @@ def question(request, id, slug='', answer=None):
         question = Question.objects.get(id=id)
     except:
         if slug:
         question = Question.objects.get(id=id)
     except:
         if slug:

-            question = match_question_slug(slug)
+            question = match_question_slug(id, slug)

             if question is not None:
                 return HttpResponseRedirect(question.get_absolute_url())
 
             if question is not None:
                 return HttpResponseRedirect(question.get_absolute_url())
 


@@ -314,9 +333,9 @@ def question(request, id, slug='', answer=None):
         return HttpResponsePermanentRedirect(question.get_absolute_url())
 
     if request.POST:
         return HttpResponsePermanentRedirect(question.get_absolute_url())
 
     if request.POST:

-        answer_form = AnswerForm(question, request.POST)
+        answer_form = AnswerForm(request.POST, user=request.user)

     else:
     else:

-        answer_form = AnswerForm(question)
+        answer_form = AnswerForm(user=request.user)

 
     answers = request.user.get_visible_answers(question)
 
 
     answers = request.user.get_visible_answers(question)