X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/b41b4ee4bbc7ad0352169476bfa43a11d2e48ae0..32509c7ba5495ee0b0e42b0343cbd2a6125532cd:/forum/views/readers.py?ds=inline diff --git a/forum/views/readers.py b/forum/views/readers.py index c88ba68..669eaf3 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -2,35 +2,29 @@ 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.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.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.template.defaultfilters import slugify 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 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.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 + import decorators class HottestQuestionsSort(pagination.SortBase): @@ -91,14 +85,16 @@ def index(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): - return question_list(request, Question.objects.all(), _('questions')) + return question_list(request, + Question.objects.all(), + _('questions')) @decorators.render('questions.html') def tag(request, tag): @@ -119,13 +115,30 @@ def tag(request, tag): 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, mark_safe(_(u'questions tagged %(tag)s') % {'tag': tag}), None, mark_safe(_(u'Questions Tagged With %(tag)s') % {'tag': tag}), 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) @@ -160,7 +173,13 @@ def question_list(request, initial, allowIgnoreTags=True, feed_url=None, paginator_context=None, - feed_sort=('-added_at',)): + 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) @@ -183,23 +202,28 @@ def question_list(request, initial, #answer_description = _("answers") if not feed_url: - req_params = generate_uri(request.GET, (_('page'), _('pagesize'))) + req_params = generate_uri(request.GET, feed_req_params_exclude) if req_params: req_params = '&' + req_params feed_url = 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, - }) + 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): @@ -307,8 +331,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): @@ -358,6 +382,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, @@ -365,6 +393,8 @@ def question(request, id, slug='', answer=None): "answers" : answers, "similar_questions" : question.get_related_questions(), "subscription": subscription, + "embed_youtube_videos" : settings.EMBED_YOUTUBE_VIDEOS, + "focused_answer_id" : focused_answer_id })