]> git.openstreetmap.org Git - osqa.git/blobdiff - forum/views/readers.py
Firs answer was always redirecting to page 0.
[osqa.git] / forum / views / readers.py
index 07f6a3f2de3f5c44940939dbe4a11af1610c3637..9420ce059820e1b6a7f862c938c41033cf281561 100644 (file)
@@ -22,6 +22,7 @@ from django.utils.safestring import mark_safe
 
 from forum.utils.html import sanitize_html, hyperlink
 from forum.utils.diff import textDiff as htmldiff
+from forum.utils import pagination
 from forum.forms import *
 from forum.models import *
 from forum.forms import get_next_url
@@ -42,6 +43,31 @@ QUESTIONS_PAGE_SIZE = 30
 # used in answers
 ANSWERS_PAGE_SIZE = 10
 
+class QuestionListPaginatorContext(pagination.PaginatorContext):
+    def __init__(self):
+        super (QuestionListPaginatorContext, self).__init__('QUESTIONS_LIST', sort_methods=(
+            (_('active'), pagination.SimpleSort(_('active'), '-last_activity_at', _("most recently updated questions"))),
+            (_('newest'), pagination.SimpleSort(_('newest'), '-added_at', _("most recently asked questions"))),
+            (_('hottest'), pagination.SimpleSort(_('hottest'), '-extra_count', _("hottest questions"))),
+            (_('mostvoted'), pagination.SimpleSort(_('most voted'), '-score', _("most voted questions"))),
+        ), pagesizes=(15, 30, 50))
+
+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):
+        super (AnswerPaginatorContext, self).__init__('ANSWER_LIST', 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"))),
+        ), default_sort=_('votes'), sticky_sort = True, pagesizes=(5, 10, 20))
+    
+
 def feed(request):
     return RssQuestionFeed(
                 Question.objects.filter_state(deleted=False).order_by('-last_activity_at'),
@@ -109,31 +135,19 @@ def user_questions(request, mode, user, slug):
                          request.utils.set_sort_method('active'),
                          page_title=description % user.username)
 
-
-@decorators.list('questions', QUESTIONS_PAGE_SIZE)
 def question_list(request, initial,
                   list_description=_('questions'),
                   sort=None,
                   base_path=None,
                   page_title=_("All Questions"),
                   allowIgnoreTags=True,
-                  feed_url=None):
+                  feed_url=None,
+                  paginator_context=None):
 
     questions = initial.filter_state(deleted=False)
 
     if request.user.is_authenticated() and allowIgnoreTags:
-        questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad'))
-                                     )
-
-    if sort is not False:
-        if sort is None:
-            sort = request.utils.sort_method('latest')
-        else:
-            request.utils.set_sort_method(sort)
-
-        view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-extra_count", "mostvoted":"-score" }
-
-        questions=questions.order_by(view_dic.get(sort, '-added_at'))
+        questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad')))
 
     if page_title is None:
         page_title = _("Questions")
@@ -149,13 +163,13 @@ def question_list(request, initial,
     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 = "&".join(["%s=%s" % (k, v) for k, v in request.GET.items() if not k in (_('page'), _('pagesize'), _('sort'))])
         if req_params:
             req_params = '&' + req_params
 
         feed_url = mark_safe(request.path + "?type=rss" + req_params)
 
-    return {
+    return pagination.paginated(request, 'questions', paginator_context or QuestionListPaginatorContext(), {
     "questions" : questions,
     "questions_count" : questions.count(),
     "answer_count" : answer_count,
@@ -166,7 +180,7 @@ def question_list(request, initial,
     "page_title" : page_title,
     "tab" : "questions",
     'feed_url': feed_url,
-    }
+    })
 
 
 def search(request):
@@ -187,13 +201,21 @@ def search(request):
 
 @decorators.render('questions.html')
 def question_search(request, keywords):
-    initial = Question.objects.search(keywords)
+    can_rank, initial = Question.objects.search(keywords)
+
+    if can_rank:
+        paginator_context = QuestionListPaginatorContext()
+        paginator_context.sort_methods[_('ranking')] = pagination.SimpleSort(_('relevance'), '-ranking', _("most relevant questions"))
+        paginator_context.force_sort = _('ranking')
+    else:
+        paginator_context = None
 
     return question_list(request, initial,
                          _("questions matching '%(keywords)s'") % {'keywords': keywords},
                          False,
                          "%s?t=question&q=%s" % (reverse('search'),django_urlquote(keywords)),
-                         _("questions matching '%(keywords)s'") % {'keywords': keywords})
+                         _("questions matching '%(keywords)s'") % {'keywords': keywords},
+                         paginator_context=paginator_context)
 
 
 @decorators.render('tags.html', 'tags', _('tags'), weight=100)
@@ -238,19 +260,6 @@ def tags(request):
         }
     }
 
-def get_answer_sort_order(request):
-    view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score" }
-
-    view_id = request.GET.get('sort', request.session.get('answer_sort_order', None))
-
-    if view_id is None or not view_id in view_dic:
-        view_id = "votes"
-
-    if view_id != request.session.get('answer_sort_order', None):
-        request.session['answer_sort_order'] = view_id
-
-    return (view_id, view_dic[view_id])
-
 def update_question_view_times(request, question):
     if not 'last_seen_in_question' in request.session:
         request.session['last_seen_in_question'] = {}
@@ -273,23 +282,60 @@ def match_question_slug(slug):
 
     return None
 
-def question(request, id, slug):
+def answer_redirect(request, answer):
+    pc = AnswerPaginatorContext()
+
+    sort = pc.sort(request)
+
+    if sort == _('oldest'):
+        filter = Q(added_at__lt=answer.added_at)
+    elif sort == _('newest'):
+        filter = Q(added_at__gt=answer.added_at)
+    elif sort == _('votes'):
+        filter = Q(score__gt=answer.score) | Q(score=answer.score, added_at__lt=answer.added_at)
+    else:
+        raise Http404()
+        
+    count = answer.question.answers.filter(Q(marked=True) | filter).count()
+    pagesize = pc.pagesize(request)
+
+    page = count / pagesize
+    
+    if count % pagesize:
+        page += 1
+        
+    if page == 0:
+        page = 1
+
+    return HttpResponsePermanentRedirect("%s?%s=%s#%s" % (
+        answer.question.get_absolute_url(), _('page'), page, answer.id))
+
+@decorators.render("question.html", 'questions', tabbed=False)
+def question(request, id, slug, answer=None):
     try:
         question = Question.objects.get(id=id)
     except:
         if slug:
             question = match_question_slug(slug)
             if question is not None:
-                return HttpResponsePermanentRedirect(question.get_absolute_url())
+                return HttpResponseRedirect(question.get_absolute_url())
 
         raise Http404()
 
-    page = int(request.GET.get('page', 1))
-    view_id, order_by = get_answer_sort_order(request)
-
     if question.nis.deleted and not request.user.can_view_deleted_post(question):
         raise Http404
 
+    if answer:
+        answer = get_object_or_404(Answer, id=answer)
+
+        if (question.nis.deleted and not request.user.can_view_deleted_post(question)) or answer.question != question:
+            raise Http404
+
+        if answer.marked:
+            return HttpResponsePermanentRedirect(question.get_absolute_url())
+
+        return answer_redirect(request, answer)
+
     if request.POST:
         answer_form = AnswerForm(question, request.POST)
     else:
@@ -297,13 +343,6 @@ def question(request, id, slug):
 
     answers = request.user.get_visible_answers(question)
 
-    if answers is not None:
-        answers = [a for a in answers.order_by("-marked", order_by)
-                   if not a.nis.deleted or a.author == request.user]
-
-    objects_list = Paginator(answers, ANSWERS_PAGE_SIZE)
-    page_objects = objects_list.page(page)
-
     update_question_view_times(request, question)
 
     if request.user.is_authenticated():
@@ -314,25 +353,13 @@ def question(request, id, slug):
     else:
         subscription = False
 
-    return render_to_response('question.html', {
+    return pagination.paginated(request, 'answers', AnswerPaginatorContext(), {
     "question" : question,
     "answer" : answer_form,
-    "answers" : page_objects.object_list,
-    "tab_id" : view_id,
+    "answers" : answers,
     "similar_questions" : question.get_related_questions(),
     "subscription": subscription,
-    "context" : {
-    'is_paginated' : True,
-    'pages': objects_list.num_pages,
-    'page': page,
-    'has_previous': page_objects.has_previous(),
-    'has_next': page_objects.has_next(),
-    'previous': page_objects.previous_page_number(),
-    'next': page_objects.next_page_number(),
-    'base_url' : request.path + '?sort=%s&' % view_id,
-    'extend_url' : "#sort-top"
-    }
-    }, context_instance=RequestContext(request))
+    })
 
 
 REVISION_TEMPLATE = template.loader.get_template('node/revision.html')