Previous feature addition commit introduced errors; rolling back to previous revision...

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 7a73856317486c23def9391a8c6a1462815e00b9..e0929220b6b0dfa5d9f3a1967d71b0b18ba42b45 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -10,7 +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.db.models import Q
+from django.db.models import Q, Count

 from django.utils.translation import ugettext as _
 from django.template.defaultfilters import slugify
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from django.template.defaultfilters import slugify
 from django.core.urlresolvers import reverse


@@ -22,61 +22,88 @@ 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.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
 from forum.actions import QuestionViewAction
 from forum.http_responses import HttpResponseUnauthorized
 from forum.forms import *
 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
+from forum.utils.pagination import generate_uri

 import decorators
 
 import decorators
 

-# used in index page
-#refactor - move these numbers somewhere?
-INDEX_PAGE_SIZE = 30
-INDEX_AWARD_SIZE = 15
-INDEX_TAGS_SIZE = 25
-# used in tags list
-DEFAULT_PAGE_SIZE = 60
-# used in questions
-QUESTIONS_PAGE_SIZE = 30
-# used in answers
-ANSWERS_PAGE_SIZE = 10
+class HottestQuestionsSort(pagination.SortBase):
+    def apply(self, questions):
+        return questions.annotate(new_child_count=Count('all_children')).filter(
+                all_children__added_at__gt=datetime.datetime.now() - datetime.timedelta(days=1)).order_by('-new_child_count')
+
+
+class QuestionListPaginatorContext(pagination.PaginatorContext):
+    def __init__(self, id='QUESTIONS_LIST', prefix='', default_pagesize=30):
+        super (QuestionListPaginatorContext, self).__init__(id, sort_methods=(
+            (_('active'), pagination.SimpleSort(_('active'), '-last_activity_at', _("Most <strong>recently updated</strong> questions"))),
+            (_('newest'), pagination.SimpleSort(_('newest'), '-added_at', _("most <strong>recently asked</strong> questions"))),
+            (_('hottest'), HottestQuestionsSort(_('hottest'), _("most <strong>active</strong> questions in the last 24 hours</strong>"))),
+            (_('mostvoted'), pagination.SimpleSort(_('most voted'), '-score', _("most <strong>voted</strong> questions"))),
+        ), pagesizes=(15, 30, 50), default_pagesize=default_pagesize, prefix=prefix)
+
+class AnswerSort(pagination.SimpleSort):
+    def apply(self, answers):
+        if not settings.DISABLE_ACCEPTING_FEATURE:
+            return answers.order_by(*(['-marked'] + list(self._get_order_by())))
+        else:
+            return super(AnswerSort, self).apply(answers)
+
+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', 'added_at'), _("most voted answers will be shown first"))),
+        ), default_sort=_('votes'), pagesizes=(5, 10, 20), default_pagesize=default_pagesize, prefix=prefix)
+
+class TagPaginatorContext(pagination.PaginatorContext):
+    def __init__(self):
+        super (TagPaginatorContext, self).__init__('TAG_LIST', sort_methods=(
+            (_('name'), pagination.SimpleSort(_('by name'), 'name', _("sorted alphabetically"))),
+            (_('used'), pagination.SimpleSort(_('by popularity'), '-used_count', _("sorted by frequency of tag use"))),
+        ), default_sort=_('used'), pagesizes=(30, 60, 120))
+    

 
 def feed(request):
     return RssQuestionFeed(
 
 def feed(request):
     return RssQuestionFeed(

+                request,

                 Question.objects.filter_state(deleted=False).order_by('-last_activity_at'),
                 settings.APP_TITLE + _(' - ')+ _('latest questions'),
                 Question.objects.filter_state(deleted=False).order_by('-last_activity_at'),
                 settings.APP_TITLE + _(' - ')+ _('latest questions'),

-                settings.APP_DESCRIPTION,
-                request)(request)
-
+                settings.APP_DESCRIPTION)(request)

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

+    paginator_context = QuestionListPaginatorContext()
+    paginator_context.base_path = reverse('questions')

     return question_list(request,
                          Question.objects.all(),
     return question_list(request,
                          Question.objects.all(),

-                         sort=request.utils.set_sort_method('active'),

                          base_path=reverse('questions'),
                          base_path=reverse('questions'),

-                         feed_url=reverse('latest_questions_feed'))
+                         feed_url=reverse('latest_questions_feed'),
+                         paginator_context=paginator_context)

 
 @decorators.render('questions.html', 'unanswered', _('unanswered'), weight=400)
 def unanswered(request):
     return question_list(request,
 
 @decorators.render('questions.html', 'unanswered', _('unanswered'), weight=400)
 def unanswered(request):
     return question_list(request,

-                         Question.objects.filter(extra_ref=None),
+                         Question.objects.exclude(id__in=Question.objects.filter(children__marked=True).distinct()),

                          _('open questions without an accepted answer'),
                          _('open questions without an accepted answer'),

-                         request.utils.set_sort_method('active'),

                          None,
                          _("Unanswered Questions"))
 
 @decorators.render('questions.html', 'questions', _('questions'), weight=0)
 def questions(request):
                          None,
                          _("Unanswered Questions"))
 
 @decorators.render('questions.html', 'questions', _('questions'), weight=0)
 def questions(request):

-    return question_list(request, Question.objects.all(), _('questions'), request.utils.set_sort_method('active'))
+    return question_list(request, Question.objects.all(), _('questions'))

 
 @decorators.render('questions.html')
 def tag(request, tag):
     return question_list(request,
                          Question.objects.filter(tags__name=unquote(tag)),
                          mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
 
 @decorators.render('questions.html')
 def tag(request, tag):
     return question_list(request,
                          Question.objects.filter(tags__name=unquote(tag)),
                          mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),

-                         request.utils.set_sort_method('active'),

                          None,
                          mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),
                          False)
                          None,
                          mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),
                          False)


@@ -106,63 +133,52 @@ def user_questions(request, mode, user, slug):
 
     return question_list(request, questions,
                          mark_safe(description % hyperlink(user.get_profile_url(), user.username)),
 
     return question_list(request, questions,
                          mark_safe(description % hyperlink(user.get_profile_url(), user.username)),

-                         request.utils.set_sort_method('active'),

                          page_title=description % user.username)
 
                          page_title=description % user.username)
 

-
-@decorators.list('questions', QUESTIONS_PAGE_SIZE)

 def question_list(request, initial,
                   list_description=_('questions'),
 def question_list(request, initial,
                   list_description=_('questions'),

-                  sort=None,

                   base_path=None,
                   page_title=_("All Questions"),
                   allowIgnoreTags=True,
                   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 = 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")
 
     if request.GET.get('type', None) == 'rss':
 
     if page_title is None:
         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"):
         keywords = request.GET.get("q").strip()
 
 
     keywords =  ""
     if request.GET.get("q"):
         keywords = request.GET.get("q").strip()
 

-    answer_count = Answer.objects.filter_state(deleted=False).filter(parent__in=questions).count()
-    answer_description = _("answers")
+    #answer_count = Answer.objects.filter_state(deleted=False).filter(parent__in=questions).count()
+    #answer_description = _("answers")

 
     if not feed_url:
 
     if not feed_url:

-        feed_url = request.path + "?type=rss"
+        req_params = "&".join(generate_uri(request.GET, (_('page'), _('pagesize'), _('sort'))))
+        if req_params:
+            req_params = '&' + req_params
+
+        feed_url = mark_safe(escape(request.path + "?type=rss" + req_params))

 
 

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

     "questions_count" : questions.count(),
     "questions_count" : questions.count(),

-    "answer_count" : answer_count,

     "keywords" : keywords,
     "list_description": list_description,
     "keywords" : keywords,
     "list_description": list_description,

-    "answer_description": answer_description,

     "base_path" : base_path,
     "page_title" : page_title,
     "tab" : "questions",
     'feed_url': feed_url,
     "base_path" : base_path,
     "page_title" : page_title,
     "tab" : "questions",
     'feed_url': feed_url,

-    }
+    })

 
 
 def search(request):
 
 
 def search(request):


@@ -183,69 +199,37 @@ def search(request):
 
 @decorators.render('questions.html')
 def question_search(request, keywords):
 
 @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},
 
     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})
+                         None,
+                         _("questions matching '%(keywords)s'") % {'keywords': keywords},
+                         paginator_context=paginator_context)

 
 
 @decorators.render('tags.html', 'tags', _('tags'), weight=100)
 def tags(request):
     stag = ""
 
 
 @decorators.render('tags.html', 'tags', _('tags'), weight=100)
 def tags(request):
     stag = ""

-    is_paginated = True
-    sortby = request.GET.get('sort', 'used')
-    try:
-        page = int(request.GET.get('page', '1'))
-    except ValueError:
-        page = 1
+    tags = Tag.active.all()

 
     if request.method == "GET":
         stag = request.GET.get("q", "").strip()
 
     if request.method == "GET":
         stag = request.GET.get("q", "").strip()

-        if stag != '':
-            objects_list = Paginator(Tag.active.filter(name__contains=stag), DEFAULT_PAGE_SIZE)
-        else:
-            if sortby == "name":
-                objects_list = Paginator(Tag.active.order_by("name"), DEFAULT_PAGE_SIZE)
-            else:
-                objects_list = Paginator(Tag.active.order_by("-used_count"), DEFAULT_PAGE_SIZE)
-
-    try:
-        tags = objects_list.page(page)
-    except (EmptyPage, InvalidPage):
-        tags = objects_list.page(objects_list.num_pages)
+        if stag:
+            tags = tags.filter(name__icontains=stag)

 
 

-    return {
+    return pagination.paginated(request, ('tags', TagPaginatorContext()), {

         "tags" : tags,
         "stag" : stag,
         "tags" : tags,
         "stag" : stag,

-        "tab_id" : sortby,
-        "keywords" : stag,
-        "context" : {
-            'is_paginated' : is_paginated,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': tags.has_previous(),
-            'has_next': tags.has_next(),
-            'previous': tags.previous_page_number(),
-            'next': tags.next_page_number(),
-            'base_url' : reverse('tags') + '?sort=%s&' % sortby
-        }
-    }
-
-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])
+        "keywords" : stag
+    })

 
 def update_question_view_times(request, question):
     if not 'last_seen_in_question' in request.session:
 
 def update_question_view_times(request, question):
     if not 'last_seen_in_question' in request.session:


@@ -259,7 +243,7 @@ def update_question_view_times(request, question):
 
     request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
 
 
     request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
 

-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])
 


@@ -269,23 +253,66 @@ def match_question_slug(slug):
 
     return None
 
 
     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).exclude(state_string="(deleted)").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')
+def question(request, id, slug='', answer=None):

     try:
         question = Question.objects.get(id=id)
     except:
         if slug:
     try:
         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:
             if question is not None:

-                return HttpResponsePermanentRedirect(question.get_absolute_url())
+                return HttpResponseRedirect(question.get_absolute_url())

 
         raise Http404()
 
 
         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 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)
+
+        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 settings.FORCE_SINGLE_URL and (slug != slugify(question.title)):
+        return HttpResponsePermanentRedirect(question.get_absolute_url())
+

     if request.POST:
         answer_form = AnswerForm(question, request.POST)
     else:
     if request.POST:
         answer_form = AnswerForm(question, request.POST)
     else:


@@ -293,13 +320,6 @@ def question(request, id, slug):
 
     answers = request.user.get_visible_answers(question)
 
 
     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():
     update_question_view_times(request, question)
 
     if request.user.is_authenticated():


@@ -310,25 +330,13 @@ def question(request, id, slug):
     else:
         subscription = False
 
     else:
         subscription = False
 

-    return render_to_response('question.html', {
+    return pagination.paginated(request, ('answers', AnswerPaginatorContext()), {

     "question" : question,
     "answer" : answer_form,
     "question" : question,
     "answer" : answer_form,

-    "answers" : page_objects.object_list,
-    "tab_id" : view_id,
+    "answers" : answers,

     "similar_questions" : question.get_related_questions(),
     "subscription": subscription,
     "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')
 
 
 REVISION_TEMPLATE = template.loader.get_template('node/revision.html')


@@ -336,11 +344,10 @@ REVISION_TEMPLATE = template.loader.get_template('node/revision.html')
 def revisions(request, id):
     post = get_object_or_404(Node, id=id).leaf
     revisions = list(post.revisions.order_by('revised_at'))
 def revisions(request, id):
     post = get_object_or_404(Node, id=id).leaf
     revisions = list(post.revisions.order_by('revised_at'))

-

     rev_ctx = []
 
     for i, revision in enumerate(revisions):
     rev_ctx = []
 
     for i, revision in enumerate(revisions):

-        rev_ctx.append(dict(inst=revision, html=REVISION_TEMPLATE.render(template.Context({
+        rev_ctx.append(dict(inst=revision, html=template.loader.get_template('node/revision.html').render(template.Context({

         'title': revision.title,
         'html': revision.html,
         'tags': revision.tagname_list(),
         'title': revision.title,
         'html': revision.html,
         'tags': revision.tagname_list(),


@@ -356,6 +363,8 @@ def revisions(request, id):
         else:
             rev_ctx[i]['summary'] = revision.summary
 
         else:
             rev_ctx[i]['summary'] = revision.summary
 

+    rev_ctx.reverse()
+

     return render_to_response('revisions.html', {
     'post': post,
     'revisions': rev_ctx,
     return render_to_response('revisions.html', {
     'post': post,
     'revisions': rev_ctx,