X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/b885b2a795c839540f299a7e5f33ed4b670101ab..cefbe813946f9f9e0108193156eedfd265befc33:/forum/views/readers.py
diff --git a/forum/views/readers.py b/forum/views/readers.py
index 40bd16c..5989dcd 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -10,6 +10,7 @@ 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
@@ -29,6 +30,7 @@ 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):
@@ -46,12 +48,19 @@ class QuestionListPaginatorContext(pagination.PaginatorContext):
(_('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):
@@ -69,7 +78,6 @@ def feed(request):
settings.APP_TITLE + _(' - ')+ _('latest questions'),
settings.APP_DESCRIPTION)(request)
-
@decorators.render('index.html')
def index(request):
paginator_context = QuestionListPaginatorContext()
@@ -83,7 +91,7 @@ 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'),
None,
_("Unanswered Questions"))
@@ -94,8 +102,25 @@ def questions(request):
@decorators.render('questions.html')
def tag(request, tag):
+ try:
+ tag = Tag.active.get(name=unquote(tag))
+ except Tag.DoesNotExist:
+ raise Http404
+
+ # Getting the questions QuerySet
+ questions = Question.objects.filter(tags__id=tag.id)
+
+ if request.method == "GET":
+ user = request.GET.get('user', None)
+
+ if user is not None:
+ try:
+ questions = questions.filter(author=User.objects.get(username=user))
+ except User.DoesNotExist:
+ raise Http404
+
return question_list(request,
- Question.objects.filter(tags__name=unquote(tag)),
+ questions,
mark_safe(_('questions tagged %(tag)s') % {'tag': tag}),
None,
mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),
@@ -152,23 +177,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 = 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 = 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",
@@ -187,7 +210,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))
@@ -203,12 +226,14 @@ def question_search(request, keywords):
else:
paginator_context = None
+ feed_url = mark_safe(escape(request.path + "?type=rss&q=" + 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)
+ paginator_context=paginator_context,
+ feed_url=feed_url)
@decorators.render('tags.html', 'tags', _('tags'), weight=100)
@@ -219,7 +244,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,
@@ -228,18 +253,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()
-
- 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
-def match_question_slug(slug):
+def match_question_slug(id, slug):
slug_words = slug.split('-')
qs = Question.objects.filter(title__istartswith=slug_words[0])
@@ -262,8 +285,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
@@ -283,7 +306,7 @@ def question(request, id, slug='', answer=None):
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())
@@ -310,9 +333,9 @@ def question(request, id, slug='', answer=None):
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)