X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/162b4fd442c169a61d2f5b2b3bd613546c8472da..f6b59a872054fb7e4c171cbdffb5470d55c9025e:/forum/views/readers.py
diff --git a/forum/views/readers.py b/forum/views/readers.py
index 999d320..38c3c9f 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -10,7 +10,7 @@ from django.template import RequestContext
from django import template
from django.utils.html import *
from django.utils import simplejson
-from django.db.models import Q
+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
@@ -28,32 +28,39 @@ 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
+from forum.feed import RssQuestionFeed, RssAnswerFeed
+from forum.utils.pagination import generate_uri
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')
+
+
class QuestionListPaginatorContext(pagination.PaginatorContext):
- def __init__(self):
- super (QuestionListPaginatorContext, self).__init__('QUESTIONS_LIST', sort_methods=(
- (_('active'), pagination.SimpleSort(_('active'), '-last_activity_at', _("most recently updated questions"))),
- (_('newest'), pagination.SimpleSort(_('newest'), '-added_at', _("most recently asked questions"))),
- (_('hottest'), pagination.SimpleSort(_('hottest'), '-extra_count', _("hottest questions"))),
- (_('mostvoted'), pagination.SimpleSort(_('most voted'), '-score', _("most voted questions"))),
- ), pagesizes=(15, 30, 50))
+ def __init__(self, id='QUESTIONS_LIST', prefix='', default_pagesize=30):
+ super (QuestionListPaginatorContext, self).__init__(id, sort_methods=(
+ (_('active'), pagination.SimpleSort(_('active'), '-last_activity_at', _("Most recently updated questions"))),
+ (_('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"))),
+ ), pagesizes=(15, 30, 50), default_pagesize=default_pagesize, prefix=prefix)
class AnswerSort(pagination.SimpleSort):
- def apply(self, objects):
- if self.label == _('votes'):
- return objects.order_by('-marked', self.order_by, 'added_at')
+ def apply(self, answers):
+ if not settings.DISABLE_ACCEPTING_FEATURE:
+ return answers.order_by(*(['-marked'] + list(self._get_order_by())))
else:
- return objects.order_by('-marked', self.order_by)
+ return super(AnswerSort, self).apply(answers)
class AnswerPaginatorContext(pagination.PaginatorContext):
- def __init__(self):
- super (AnswerPaginatorContext, self).__init__('ANSWER_LIST', sort_methods=(
+ def __init__(self, id='ANSWER_LIST', prefix='', default_pagesize=10):
+ super (AnswerPaginatorContext, self).__init__(id, sort_methods=(
(_('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', _("most voted answers will be shown first"))),
- ), default_sort=_('votes'), sticky_sort = True, pagesizes=(5, 10, 20))
+ (_('votes'), AnswerSort(_('popular answers'), ('-score', 'added_at'), _("most voted answers will be shown first"))),
+ ), default_sort=_('votes'), pagesizes=(5, 10, 20), default_pagesize=default_pagesize, prefix=prefix)
class TagPaginatorContext(pagination.PaginatorContext):
def __init__(self):
@@ -65,39 +72,38 @@ class TagPaginatorContext(pagination.PaginatorContext):
def feed(request):
return RssQuestionFeed(
+ request,
Question.objects.filter_state(deleted=False).order_by('-last_activity_at'),
settings.APP_TITLE + _(' - ')+ _('latest questions'),
- settings.APP_DESCRIPTION,
- request)(request)
-
+ settings.APP_DESCRIPTION)(request)
@decorators.render('index.html')
def index(request):
+ paginator_context = QuestionListPaginatorContext()
+ paginator_context.base_path = reverse('questions')
return question_list(request,
Question.objects.all(),
- sort=request.utils.set_sort_method('active'),
base_path=reverse('questions'),
- feed_url=reverse('latest_questions_feed'))
+ feed_url=reverse('latest_questions_feed'),
+ paginator_context=paginator_context)
@decorators.render('questions.html', 'unanswered', _('unanswered'), weight=400)
def unanswered(request):
return question_list(request,
- Question.objects.filter(extra_ref=None),
+ Question.objects.exclude(id__in=Question.objects.filter(children__marked=True).distinct()),
_('open questions without an accepted answer'),
- request.utils.set_sort_method('active'),
None,
_("Unanswered Questions"))
@decorators.render('questions.html', 'questions', _('questions'), weight=0)
def questions(request):
- return question_list(request, Question.objects.all(), _('questions'), request.utils.set_sort_method('active'))
+ return question_list(request, Question.objects.all(), _('questions'))
@decorators.render('questions.html')
def tag(request, tag):
return question_list(request,
Question.objects.filter(tags__name=unquote(tag)),
mark_safe(_('questions tagged %(tag)s') % {'tag': tag}),
- request.utils.set_sort_method('active'),
None,
mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),
False)
@@ -127,12 +133,10 @@ def user_questions(request, mode, user, slug):
return question_list(request, questions,
mark_safe(description % hyperlink(user.get_profile_url(), user.username)),
- request.utils.set_sort_method('active'),
page_title=description % user.username)
def question_list(request, initial,
list_description=_('questions'),
- sort=None,
base_path=None,
page_title=_("All Questions"),
allowIgnoreTags=True,
@@ -148,29 +152,28 @@ def question_list(request, initial,
page_title = _("Questions")
if request.GET.get('type', None) == 'rss':
- return RssQuestionFeed(questions, page_title, list_description, request)(request)
+ questions = questions.order_by('-added_at')
+ return RssQuestionFeed(request, questions, page_title, list_description)(request)
keywords = ""
if request.GET.get("q"):
keywords = request.GET.get("q").strip()
- answer_count = Answer.objects.filter_state(deleted=False).filter(parent__in=questions).count()
- answer_description = _("answers")
+ #answer_count = Answer.objects.filter_state(deleted=False).filter(parent__in=questions).count()
+ #answer_description = _("answers")
if not feed_url:
- req_params = "&".join(["%s=%s" % (k, v) for k, v in request.GET.items() if not k in (_('page'), _('pagesize'), _('sort'))])
+ req_params = "&".join(generate_uri(request.GET, (_('page'), _('pagesize'), _('sort'))))
if req_params:
req_params = '&' + req_params
feed_url = mark_safe(request.path + "?type=rss" + req_params)
- return pagination.paginated(request, 'questions', paginator_context or QuestionListPaginatorContext(), {
- "questions" : questions,
+ return pagination.paginated(request, ('questions', paginator_context or QuestionListPaginatorContext()), {
+ "questions" : questions.distinct(),
"questions_count" : questions.count(),
- "answer_count" : answer_count,
"keywords" : keywords,
"list_description": list_description,
- "answer_description": answer_description,
"base_path" : base_path,
"page_title" : page_title,
"tab" : "questions",
@@ -207,8 +210,7 @@ def question_search(request, keywords):
return question_list(request, initial,
_("questions matching '%(keywords)s'") % {'keywords': keywords},
- False,
- "%s?t=question&q=%s" % (reverse('search'),django_urlquote(keywords)),
+ None,
_("questions matching '%(keywords)s'") % {'keywords': keywords},
paginator_context=paginator_context)
@@ -223,7 +225,7 @@ def tags(request):
if stag:
tags = tags.filter(name__contains=stag)
- return pagination.paginated(request, 'tags', TagPaginatorContext(), {
+ return pagination.paginated(request, ('tags', TagPaginatorContext()), {
"tags" : tags,
"stag" : stag,
"keywords" : stag
@@ -241,7 +243,7 @@ def update_question_view_times(request, question):
request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
-def match_question_slug(slug):
+def match_question_slug(id, slug):
slug_words = slug.split('-')
qs = Question.objects.filter(title__istartswith=slug_words[0])
@@ -264,7 +266,7 @@ def answer_redirect(request, answer):
filter = Q(score__gt=answer.score) | Q(score=answer.score, added_at__lt=answer.added_at)
else:
raise Http404()
-
+
count = answer.question.answers.filter(Q(marked=True) | filter).count()
pagesize = pc.pagesize(request)
@@ -279,13 +281,13 @@ def answer_redirect(request, answer):
return HttpResponsePermanentRedirect("%s?%s=%s#%s" % (
answer.question.get_absolute_url(), _('page'), page, answer.id))
-@decorators.render("question.html", 'questions', tabbed=False)
-def question(request, id, slug, answer=None):
+@decorators.render("question.html", 'questions')
+def question(request, id, slug='', answer=None):
try:
question = Question.objects.get(id=id)
except:
if slug:
- question = match_question_slug(slug)
+ question = match_question_slug(id, slug)
if question is not None:
return HttpResponseRedirect(question.get_absolute_url())
@@ -294,6 +296,9 @@ def question(request, id, slug, answer=None):
if question.nis.deleted and not request.user.can_view_deleted_post(question):
raise Http404
+ if request.GET.get('type', None) == 'rss':
+ return RssAnswerFeed(request, question, include_comments=request.GET.get('comments', None) == 'yes')(request)
+
if answer:
answer = get_object_or_404(Answer, id=answer)
@@ -305,6 +310,9 @@ def question(request, id, slug, answer=None):
return answer_redirect(request, answer)
+ if settings.FORCE_SINGLE_URL and (slug != slugify(question.title)):
+ return HttpResponsePermanentRedirect(question.get_absolute_url())
+
if request.POST:
answer_form = AnswerForm(question, request.POST)
else:
@@ -322,7 +330,7 @@ def question(request, id, slug, answer=None):
else:
subscription = False
- return pagination.paginated(request, 'answers', AnswerPaginatorContext(), {
+ return pagination.paginated(request, ('answers', AnswerPaginatorContext()), {
"question" : question,
"answer" : answer_form,
"answers" : answers,