Merge pull request #44 from udacity/merge_small_prs

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 99233e895abd01915576b2a0867a5d442718b094..a8b94e92e200bec718b5f77aec4a07a4b2d1cb1f 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -8,6 +8,7 @@ from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template import RequestContext
 from django import template
 from django.utils.html import *
 from django.template import RequestContext
 from django import template
 from django.utils.html import *

+from django.utils.http import urlquote

 from django.db.models import Q, Count
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from django.db.models import Q, Count
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse


@@ -92,7 +93,9 @@ def unanswered(request):
 
 @decorators.render('questions.html', 'questions', _('questions'), weight=0)
 def questions(request):
 
 @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):


@@ -171,10 +174,14 @@ def question_list(request, initial,
                   allowIgnoreTags=True,
                   feed_url=None,
                   paginator_context=None,
                   allowIgnoreTags=True,
                   feed_url=None,
                   paginator_context=None,

+                  show_summary=None,

                   feed_sort=('-added_at',),
                   feed_req_params_exclude=(_('page'), _('pagesize'), _('sort')),
                   extra_context={}):
 
                   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)
 
     if request.user.is_authenticated() and allowIgnoreTags:
     questions = initial.filter_state(deleted=False)
 
     if request.user.is_authenticated() and allowIgnoreTags:


@@ -212,6 +219,7 @@ def question_list(request, initial,
         'page_title' : page_title,
         'tab' : 'questions',
         'feed_url': feed_url,
         'page_title' : page_title,
         'tab' : 'questions',
         'feed_url': feed_url,

+        'show_summary' : show_summary,

     }
     context.update(extra_context)
 
     }
     context.update(extra_context)
 


@@ -324,8 +332,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):


@@ -375,6 +383,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,


@@ -383,6 +395,7 @@ def question(request, id, slug='', answer=None):
     "similar_questions" : question.get_related_questions(),
     "subscription": subscription,
     "embed_youtube_videos" : settings.EMBED_YOUTUBE_VIDEOS,
     "similar_questions" : question.get_related_questions(),
     "subscription": subscription,
     "embed_youtube_videos" : settings.EMBED_YOUTUBE_VIDEOS,

+    "focused_answer_id" : focused_answer_id

     })
 
 
     })