Improves the answer position guessing.

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 69ef208a2e9119f703d0ab1d5774fa5277682b10..4bdb58bc9a438e3d0722a4446f8011c45ec76bba 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -28,7 +28,7 @@ from forum.models import *
 from forum.forms import get_next_url
 from forum.actions import QuestionViewAction
 from forum.http_responses import HttpResponseUnauthorized
-from forum.feed import RssQuestionFeed
+from forum.feed import RssQuestionFeed, RssAnswerFeed
 import decorators
 
 class QuestionListPaginatorContext(pagination.PaginatorContext):
@@ -40,19 +40,12 @@ class QuestionListPaginatorContext(pagination.PaginatorContext):
             (_('mostvoted'), pagination.SimpleSort(_('most voted'), '-score', _("most voted questions"))),
         ), pagesizes=(15, 30, 50), default_pagesize=default_pagesize, prefix=prefix)
 
-class AnswerSort(pagination.SimpleSort):
-    def apply(self, objects):
-        if self.label == _('votes'):
-            return objects.order_by('-marked', self.order_by, 'added_at')
-        else:
-            return objects.order_by('-marked', self.order_by)
-
 class AnswerPaginatorContext(pagination.PaginatorContext):
     def __init__(self, id='ANSWER_LIST', prefix='', default_pagesize=10):
         super (AnswerPaginatorContext, self).__init__(id, sort_methods=(
-            (_('oldest'), AnswerSort(_('oldest answers'), 'added_at', _("oldest answers will be shown first"))),
-            (_('newest'), AnswerSort(_('newest answers'), '-added_at', _("newest answers will be shown first"))),
-            (_('votes'), AnswerSort(_('popular answers'), '-score', _("most voted answers will be shown first"))),
+            (_('oldest'), pagination.SimpleSort(_('oldest answers'), ('-marked', 'added_at'), _("oldest answers will be shown first"))),
+            (_('newest'), pagination.SimpleSort(_('newest answers'), ('-marked', '-added_at'), _("newest answers will be shown first"))),
+            (_('votes'), pagination.SimpleSort(_('popular answers'), ('-marked', '-score', 'added_at'), _("most voted answers will be shown first"))),
         ), default_sort=_('votes'), sticky_sort = True, pagesizes=(5, 10, 20), default_pagesize=default_pagesize, prefix=prefix)
 
 class TagPaginatorContext(pagination.PaginatorContext):
@@ -148,7 +141,8 @@ def question_list(request, initial,
         page_title = _("Questions")
 
     if request.GET.get('type', None) == 'rss':
-        return RssQuestionFeed(questions, page_title, list_description, request)(request)
+        questions = questions.order_by('-added_at')
+        return RssQuestionFeed(request, questions, page_title, list_description)(request)
 
     keywords =  ""
     if request.GET.get("q"):
@@ -280,7 +274,7 @@ def answer_redirect(request, answer):
         answer.question.get_absolute_url(), _('page'), page, answer.id))
 
 @decorators.render("question.html", 'questions')
-def question(request, id, slug, answer=None):
+def question(request, id, slug=None, answer=None):
     try:
         question = Question.objects.get(id=id)
     except:
@@ -294,6 +288,9 @@ def question(request, id, slug, answer=None):
     if question.nis.deleted and not request.user.can_view_deleted_post(question):
         raise Http404
 
+    if request.GET.get('type', None) == 'rss':
+        return RssAnswerFeed(request, question, include_comments=request.GET.get('comments', None) == 'yes')(request)
+
     if answer:
         answer = get_object_or_404(Answer, id=answer)
 
@@ -305,6 +302,9 @@ def question(request, id, slug, answer=None):
 
         return answer_redirect(request, answer)
 
+    if (not slug) or (slug != urlquote(slugify(question.title))):
+        return HttpResponsePermanentRedirect(question.get_absolute_url())
+
     if request.POST:
         answer_form = AnswerForm(question, request.POST)
     else: