X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/5854d9a155795c14b005afee1b0bb93d8b659462..c71c3fdc6b5cfe709945dc37305d2798acd6eb30:/forum/views/readers.py

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 7404b92..3de8c41 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -172,7 +172,8 @@ def question_list(request, initial,
                   feed_url=None,
                   paginator_context=None,
                   feed_sort=('-added_at',),
-                  feed_req_params_exclude=(_('page'), _('pagesize'), _('sort'))):
+                  feed_req_params_exclude=(_('page'), _('pagesize'), _('sort')),
+                  extra_context={}):
 
     questions = initial.filter_state(deleted=False)
 
@@ -212,6 +213,7 @@ def question_list(request, initial,
         'tab' : 'questions',
         'feed_url': feed_url,
     }
+    context.update(extra_context)
 
     return pagination.paginated(request,
                                ('questions', paginator_context or QuestionListPaginatorContext()), context)
@@ -322,8 +324,8 @@ def answer_redirect(request, answer):
     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):
@@ -373,6 +375,10 @@ def question(request, id, slug='', answer=None):
             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,
@@ -381,6 +387,7 @@ def question(request, id, slug='', answer=None):
     "similar_questions" : question.get_related_questions(),
     "subscription": subscription,
     "embed_youtube_videos" : settings.EMBED_YOUTUBE_VIDEOS,
+    "focused_answer_id" : focused_answer_id
     })