X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/303b118d8ffc0ed2285166e362a91774f64ad807..745f67c37acdb9574c5297004adde2b9a7da5fdb:/forum/views/readers.py
diff --git a/forum/views/readers.py b/forum/views/readers.py
index 0d282b8..991a6b6 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -6,11 +6,12 @@ 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.core.paginator import Paginator, EmptyPage, InvalidPage
+from django.core.exceptions import ObjectDoesNotExist
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
@@ -29,23 +30,37 @@ 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):
+ 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, 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'), pagination.SimpleSort(_('hottest'), '-extra_count', _("hottest questions"))),
- (_('mostvoted'), pagination.SimpleSort(_('most voted'), '-score', _("most voted questions"))),
+ (_('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, answers):
+ if not settings.DISABLE_ACCEPTING_FEATURE:
+ return answers.order_by(*(['-marked'] + list(self._get_order_by())))
+ else:
+ return super(AnswerSort, self).apply(answers)
+
class AnswerPaginatorContext(pagination.PaginatorContext):
def __init__(self, id='ANSWER_LIST', prefix='', default_pagesize=10):
super (AnswerPaginatorContext, self).__init__(id, sort_methods=(
- (_('oldest'), pagination.SimpleSort(_('oldest answers'), ('-marked', 'added_at'), _("oldest answers will be shown first"))),
- (_('newest'), pagination.SimpleSort(_('newest answers'), ('-marked', '-added_at'), _("newest answers will be shown first"))),
- (_('votes'), pagination.SimpleSort(_('popular answers'), ('-marked', '-score', 'added_at'), _("most voted answers 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"))),
), default_sort=_('votes'), pagesizes=(5, 10, 20), default_pagesize=default_pagesize, prefix=prefix)
class TagPaginatorContext(pagination.PaginatorContext):
@@ -63,14 +78,12 @@ def feed(request):
settings.APP_TITLE + _(' - ')+ _('latest questions'),
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'),
paginator_context=paginator_context)
@@ -78,22 +91,27 @@ def index(request):
@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):
+
+ try:
+ tag = Tag.active.get(name=unquote(tag))
+ except Tag.DoesNotExist:
+ raise Http404
+
+
return question_list(request,
- Question.objects.filter(tags__name=unquote(tag)),
+ Question.objects.filter(tags=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)
@@ -123,12 +141,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,
@@ -151,23 +167,21 @@ def question_list(request, initial,
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)
+ feed_url = mark_safe(escape(request.path + "?type=rss" + req_params))
return pagination.paginated(request, ('questions', paginator_context or QuestionListPaginatorContext()), {
- "questions" : questions,
+ "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",
@@ -186,7 +200,7 @@ def search(request):
return HttpResponseRedirect(reverse('tags') + '?q=%s' % urlquote(keywords.strip()))
elif search_type == "user":
return HttpResponseRedirect(reverse('users') + '?q=%s' % urlquote(keywords.strip()))
- elif search_type == "question":
+ else:
return question_search(request, keywords)
else:
return render_to_response("search.html", context_instance=RequestContext(request))
@@ -204,8 +218,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)
@@ -218,7 +231,7 @@ def tags(request):
if request.method == "GET":
stag = request.GET.get("q", "").strip()
if stag:
- tags = tags.filter(name__contains=stag)
+ tags = tags.filter(name__icontains=stag)
return pagination.paginated(request, ('tags', TagPaginatorContext()), {
"tags" : tags,
@@ -227,18 +240,16 @@ def tags(request):
})
def update_question_view_times(request, question):
- if not 'last_seen_in_question' in request.session:
- request.session['last_seen_in_question'] = {}
+ last_seen_in_question = request.session.get('last_seen_in_question', {})
- last_seen = request.session['last_seen_in_question'].get(question.id, None)
+ last_seen = last_seen_in_question.get(question.id, None)
- if (not last_seen) or last_seen < question.last_activity_at:
+ if (not last_seen) or (last_seen < question.last_activity_at):
QuestionViewAction(question, request.user, ip=request.META['REMOTE_ADDR']).save()
- request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
+ last_seen_in_question[question.id] = datetime.datetime.now()
+ request.session['last_seen_in_question'] = last_seen_in_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])
@@ -261,8 +272,8 @@ 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()
+
+ count = answer.question.answers.filter(Q(marked=True) | filter).exclude(state_string="(deleted)").count()
pagesize = pc.pagesize(request)
page = count / pagesize
@@ -277,12 +288,12 @@ def answer_redirect(request, answer):
answer.question.get_absolute_url(), _('page'), page, answer.id))
@decorators.render("question.html", 'questions')
-def question(request, id, slug=None, answer=None):
+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())
@@ -305,13 +316,13 @@ def question(request, id, slug=None, answer=None):
return answer_redirect(request, answer)
- if (not slug) or (slug != urlquote(slugify(question.title))):
+ 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)
+ answer_form = AnswerForm(request.POST, user=request.user)
else:
- answer_form = AnswerForm(question)
+ answer_form = AnswerForm(user=request.user)
answers = request.user.get_visible_answers(question)