X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f1defc59ca7a7b15e17e8a59c72a726ae937d8e5..d5134f7b8c1b8ef13f44de06844a569c433ebf29:/forum/views/readers.py
diff --git a/forum/views/readers.py b/forum/views/readers.py
index d757e51..fc819bf 100644
--- 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.utils.http import urlquote
from django.db.models import Q, Count
from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
@@ -29,9 +30,28 @@ import decorators
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')
-
+ return questions.extra(select={'new_child_count': '''
+ SELECT COUNT(1)
+ FROM forum_node fn1
+ WHERE fn1.abs_parent_id = forum_node.id
+ AND fn1.id != forum_node.id
+ AND NOT(fn1.state_string LIKE '%%(deleted)%%')
+ AND added_at > %s'''
+ },
+ select_params=[ (datetime.datetime.now() - datetime.timedelta(days=2))
+ .strftime('%Y-%m-%d')]
+ ).order_by('-new_child_count', 'last_activity_at')
+
+class UnansweredQuestionsSort(pagination.SortBase):
+ def apply(self, questions):
+ return questions.extra(select={'answer_count': '''
+ SELECT COUNT(1)
+ FROM forum_node fn1
+ WHERE fn1.abs_parent_id = forum_node.id
+ AND fn1.id != forum_node.id
+ AND fn1.node_type='answer'
+ AND NOT(fn1.state_string LIKE '%%(deleted)%%')'''
+ }).order_by('answer_count', 'last_activity_at')
class QuestionListPaginatorContext(pagination.PaginatorContext):
def __init__(self, id='QUESTIONS_LIST', prefix='', pagesizes=(15, 30, 50), default_pagesize=30):
@@ -40,6 +60,7 @@ class QuestionListPaginatorContext(pagination.PaginatorContext):
(_('newest'), pagination.SimpleSort(_('newest'), '-added_at', _("most recently asked questions"))),
(_('hottest'), HottestQuestionsSort(_('hottest'), _("most active questions in the last 24 hours"))),
(_('mostvoted'), pagination.SimpleSort(_('most voted'), '-score', _("most voted questions"))),
+ (_('unanswered'), UnansweredQuestionsSort('unanswered', "questions with no answers")),
), pagesizes=pagesizes, default_pagesize=default_pagesize, prefix=prefix)
class AnswerSort(pagination.SimpleSort):
@@ -52,6 +73,7 @@ class AnswerSort(pagination.SimpleSort):
class AnswerPaginatorContext(pagination.PaginatorContext):
def __init__(self, id='ANSWER_LIST', prefix='', default_pagesize=10):
super (AnswerPaginatorContext, self).__init__(id, sort_methods=(
+ (_('active'), AnswerSort(_('active answers'), '-last_activity_at', _("most recently updated answers/comments will be shown first"))),
(_('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"))),
@@ -92,7 +114,9 @@ def unanswered(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):
@@ -113,13 +137,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)
@@ -154,8 +195,13 @@ def question_list(request, initial,
allowIgnoreTags=True,
feed_url=None,
paginator_context=None,
+ show_summary=None,
feed_sort=('-added_at',),
- feed_req_params_exclude=(_('page'), _('pagesize'), _('sort'))):
+ 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)
@@ -185,16 +231,21 @@ def question_list(request, initial,
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):
@@ -302,8 +353,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):
@@ -353,6 +404,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,
@@ -361,6 +416,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
})