OSQA-809, Include question summaries in question and answers views, wrap that in...

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 2878424e29703bee4dc546386e6a305f1820fe98..669eaf3006a849aefdaf84d40e3adf72d6089742 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -2,35 +2,29 @@
 import datetime
 import logging
 from urllib import unquote
 import datetime
 import logging
 from urllib import unquote

-from forum import settings as django_settings

 from django.shortcuts import render_to_response, get_object_or_404
 from django.shortcuts import render_to_response, get_object_or_404

-from django.http import HttpResponseRedirect, HttpResponse, Http404, HttpResponsePermanentRedirect
+from django.http import HttpResponseRedirect, Http404, HttpResponsePermanentRedirect

 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template import RequestContext
 from django import template
 from django.utils.html import *
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 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.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.core.urlresolvers import reverse

-from django.utils.datastructures import SortedDict
-from django.views.decorators.cache import cache_page
-from django.utils.http import urlquote  as django_urlquote

 from django.template.defaultfilters import slugify
 from django.utils.safestring import mark_safe
 
 from django.template.defaultfilters import slugify
 from django.utils.safestring import mark_safe
 

-from forum.utils.html import sanitize_html, hyperlink
+from forum import settings as django_settings
+from forum.utils.html import hyperlink

 from forum.utils.diff import textDiff as htmldiff
 from forum.utils import pagination
 from forum.forms import *
 from forum.models import *
 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.feed import RssQuestionFeed, RssAnswerFeed
 from forum.utils.pagination import generate_uri
 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):


@@ -40,13 +34,13 @@ class HottestQuestionsSort(pagination.SortBase):
 
 
 class QuestionListPaginatorContext(pagination.PaginatorContext):
 
 
 class QuestionListPaginatorContext(pagination.PaginatorContext):

-    def __init__(self, id='QUESTIONS_LIST', prefix='', default_pagesize=30):
+    def __init__(self, id='QUESTIONS_LIST', prefix='', pagesizes=(15, 30, 50), 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"))),
         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)
+        ), pagesizes=pagesizes, default_pagesize=default_pagesize, prefix=prefix)

 
 class AnswerSort(pagination.SimpleSort):
     def apply(self, answers):
 
 class AnswerSort(pagination.SimpleSort):
     def apply(self, answers):


@@ -91,14 +85,16 @@ def index(request):
 @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.exclude(id__in=Question.objects.filter(children__marked=True).distinct()),
+                         Question.objects.exclude(id__in=Question.objects.filter(children__marked=True).distinct()).exclude(marked=True),

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

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

 
 @decorators.render('questions.html')
 def tag(request, tag):
 
 @decorators.render('questions.html')
 def tag(request, tag):


@@ -108,7 +104,7 @@ def tag(request, tag):
         raise Http404
 
     # Getting the questions QuerySet
         raise Http404
 
     # Getting the questions QuerySet

-    questions = Question.objects.filter(tags__name=smart_unicode(tag.name))
+    questions = Question.objects.filter(tags__id=tag.id)

 
     if request.method == "GET":
         user = request.GET.get('user', None)
 
     if request.method == "GET":
         user = request.GET.get('user', None)


@@ -119,13 +115,30 @@ def tag(request, tag):
             except User.DoesNotExist:
                 raise Http404
 
             except User.DoesNotExist:
                 raise Http404
 

-    return question_list(request,
+    # The extra tag context we need to pass
+    tag_context = {
+        'tag' : tag,
+    }
+
+    # The context returned by the question_list function, contains info about the questions
+    question_context = question_list(request,

                          questions,
                          questions,

-                         mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
+                         mark_safe(_(u'questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),

                          None,
                          None,

-                         mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),
+                         mark_safe(_(u'Questions Tagged With %(tag)s') % {'tag': tag}),

                          False)
 
                          False)
 

+    # If the return data type is not a dict just return it
+    if not isinstance(question_context, dict):
+        return question_context
+
+    question_context = dict(question_context)
+
+    # Create the combined context
+    context = dict(question_context.items() + tag_context.items())
+
+    return context
+

 @decorators.render('questions.html', 'questions', tabbed=False)
 def user_questions(request, mode, user, slug):
     user = get_object_or_404(User, id=user)
 @decorators.render('questions.html', 'questions', tabbed=False)
 def user_questions(request, mode, user, slug):
     user = get_object_or_404(User, id=user)


@@ -159,7 +172,14 @@ def question_list(request, initial,
                   page_title=_("All Questions"),
                   allowIgnoreTags=True,
                   feed_url=None,
                   page_title=_("All Questions"),
                   allowIgnoreTags=True,
                   feed_url=None,

-                  paginator_context=None):
+                  paginator_context=None,
+                  show_summary=None,
+                  feed_sort=('-added_at',),
+                  feed_req_params_exclude=(_('page'), _('pagesize'), _('sort')),
+                  extra_context={}):
+
+    if show_summary is None:
+        show_summary = bool(settings.SHOW_SUMMARY_ON_QUESTIONS_LIST)

 
     questions = initial.filter_state(deleted=False)
 
 
     questions = initial.filter_state(deleted=False)
 


@@ -170,7 +190,8 @@ def question_list(request, initial,
         page_title = _("Questions")
 
     if request.GET.get('type', None) == 'rss':
         page_title = _("Questions")
 
     if request.GET.get('type', None) == 'rss':

-        questions = questions.order_by('-added_at')
+        if feed_sort:
+            questions = questions.order_by(*feed_sort)

         return RssQuestionFeed(request, questions, page_title, list_description)(request)
 
     keywords =  ""
         return RssQuestionFeed(request, questions, page_title, list_description)(request)
 
     keywords =  ""


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

-        req_params = "&".join(generate_uri(request.GET, (_('page'), _('pagesize'), _('sort'))))
+        req_params = generate_uri(request.GET, feed_req_params_exclude)
+

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

-        feed_url = mark_safe(escape(request.path + "?type=rss" + req_params))
-
-    return pagination.paginated(request, ('questions', paginator_context or QuestionListPaginatorContext()), {
-    "questions" : questions.distinct(),
-    "questions_count" : questions.count(),
-    "keywords" : keywords,
-    "list_description": list_description,
-    "base_path" : base_path,
-    "page_title" : page_title,
-    "tab" : "questions",
-    'feed_url': feed_url,
-    })
+        feed_url = request.path + "?type=rss" + req_params
+
+    context = {
+        'questions' : questions.distinct(),
+        'questions_count' : questions.count(),
+        'keywords' : keywords,
+        'list_description': list_description,
+        'base_path' : base_path,
+        'page_title' : page_title,
+        'tab' : 'questions',
+        'feed_url': feed_url,
+        'show_summary' : show_summary,
+    }
+    context.update(extra_context)
+
+    return pagination.paginated(request,
+                               ('questions', paginator_context or QuestionListPaginatorContext()), context)

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


@@ -217,11 +244,18 @@ def search(request):
 
 @decorators.render('questions.html')
 def question_search(request, keywords):
 
 @decorators.render('questions.html')
 def question_search(request, keywords):

+    rank_feed = False

     can_rank, initial = Question.objects.search(keywords)
 
     if can_rank:
     can_rank, initial = Question.objects.search(keywords)
 
     if can_rank:

+        sort_order = None
+
+        if isinstance(can_rank, basestring):
+            sort_order = can_rank
+            rank_feed = True
+

         paginator_context = QuestionListPaginatorContext()
         paginator_context = QuestionListPaginatorContext()

-        paginator_context.sort_methods[_('ranking')] = pagination.SimpleSort(_('relevance'), '-ranking', _("most relevant questions"))
+        paginator_context.sort_methods[_('ranking')] = pagination.SimpleSort(_('relevance'), sort_order, _("most relevant questions"))

         paginator_context.force_sort = _('ranking')
     else:
         paginator_context = None
         paginator_context.force_sort = _('ranking')
     else:
         paginator_context = None


@@ -233,7 +267,7 @@ def question_search(request, keywords):
                          None,
                          _("questions matching '%(keywords)s'") % {'keywords': keywords},
                          paginator_context=paginator_context,
                          None,
                          _("questions matching '%(keywords)s'") % {'keywords': keywords},
                          paginator_context=paginator_context,

-                         feed_url=feed_url)
+                         feed_url=feed_url, feed_sort=rank_feed and (can_rank,) or '-added_at')

 
 
 @decorators.render('tags.html', 'tags', _('tags'), weight=100)
 
 
 @decorators.render('tags.html', 'tags', _('tags'), weight=100)


@@ -297,8 +331,8 @@ def answer_redirect(request, answer):
     if page == 0:
         page = 1
 
     if page == 0:
         page = 1
 

-    return HttpResponsePermanentRedirect("%s?%s=%s#%s" % (
-        answer.question.get_absolute_url(), _('page'), page, answer.id))
+    return HttpResponseRedirect("%s?%s=%s&focusedAnswerId=%s#%s" % (
+        answer.question.get_absolute_url(), _('page'), page, answer.id, answer.id))

 
 @decorators.render("question.html", 'questions')
 def question(request, id, slug='', answer=None):
 
 @decorators.render("question.html", 'questions')
 def question(request, id, slug='', answer=None):


@@ -348,6 +382,10 @@ def question(request, id, slug='', answer=None):
             subscription = False
     else:
         subscription = False
             subscription = False
     else:
         subscription = False

+    try:
+        focused_answer_id = int(request.GET.get("focusedAnswerId", None))
+    except TypeError, ValueError:
+        focused_answer_id = None

 
     return pagination.paginated(request, ('answers', AnswerPaginatorContext()), {
     "question" : question,
 
     return pagination.paginated(request, ('answers', AnswerPaginatorContext()), {
     "question" : question,


@@ -355,6 +393,8 @@ def question(request, id, slug='', answer=None):
     "answers" : answers,
     "similar_questions" : question.get_related_questions(),
     "subscription": subscription,
     "answers" : answers,
     "similar_questions" : question.get_related_questions(),
     "subscription": subscription,

+    "embed_youtube_videos" : settings.EMBED_YOUTUBE_VIDEOS,
+    "focused_answer_id" : focused_answer_id

     })
 
 
     })