X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/07fe485fb0a119fb87f8ec948185b5acdd65300e..9f2913c2565411c1bb8de79a9e7d17e441c9b409:/forum/views/readers.py
diff --git a/forum/views/readers.py b/forum/views/readers.py
index 7f201aa..6e75b37 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -1,4 +1,4 @@
-# encoding:utf-8
+# encoding:utf-8
import datetime
import logging
from urllib import unquote
@@ -43,29 +43,40 @@ ANSWERS_PAGE_SIZE = 10
@decorators.render('index.html')
def index(request):
- return question_list(request, Question.objects.all(), sort='active', base_path=reverse('questions'))
+ return question_list(request,
+ Question.objects.all(),
+ sort=request.utils.set_sort_method('active'),
+ base_path=reverse('questions'))
@decorators.render('questions.html', 'unanswered')
def unanswered(request):
- return question_list(request, Question.objects.filter(extra_ref=None),
- _('Open questions without an accepted answer'))
+ return question_list(request,
+ Question.objects.filter(extra_ref=None),
+ _('open questions without an accepted answer'),
+ request.utils.set_sort_method('active'),
+ None,
+ _("Unanswered questions"))
@decorators.render('questions.html', 'questions')
def questions(request):
- return question_list(request, Question.objects.all())
+ return question_list(request, Question.objects.all(), _('questions'), request.utils.set_sort_method('active'))
@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}))
+ 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 %(tag)s') % {'tag': tag}),
+ False)
@decorators.list('questions', QUESTIONS_PAGE_SIZE)
-def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None):
- questions = initial.filter(deleted=None, in_moderation=None)
+def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None, allowIgnoreTags=True):
+ questions = initial.filter_state(deleted=False)
- if request.user.is_authenticated():
- questions = questions.filter(
- ~Q(tags__id__in=request.user.marked_tags.filter(user_selections__reason='bad')))
+ if request.user.is_authenticated() and allowIgnoreTags:
+ questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad')))
if sort is not False:
if sort is None:
@@ -77,12 +88,27 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
questions=questions.order_by(view_dic.get(sort, '-added_at'))
+ if page_title is None:
+ page_title = _("Questions")
+
+ 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")
+
return {
"questions" : questions,
"questions_count" : questions.count(),
+ "answer_count" : answer_count,
+ "keywords" : keywords,
#"tags_autocomplete" : _get_tags_cache_json(),
"list_description": list_description,
+ "answer_description": answer_description,
"base_path" : base_path,
+ "page_title" : page_title,
+ "tab" : "questions",
}
@@ -90,29 +116,25 @@ def search(request):
if request.method == "GET" and "q" in request.GET:
keywords = request.GET.get("q")
search_type = request.GET.get("t")
-
+
if not keywords:
return HttpResponseRedirect(reverse(index))
if search_type == 'tag':
- return HttpResponseRedirect(reverse('tags') + '?q=%s' % (keywords.strip()))
+ return HttpResponseRedirect(reverse('tags') + '?q=%s' % urlquote(keywords.strip()))
elif search_type == "user":
- return HttpResponseRedirect(reverse('users') + '?q=%s' % (keywords.strip()))
+ return HttpResponseRedirect(reverse('users') + '?q=%s' % urlquote(keywords.strip()))
elif search_type == "question":
return question_search(request, keywords)
else:
return render_to_response("search.html", context_instance=RequestContext(request))
-@decoratable
-def do_question_search(keywords):
- return Question.objects.filter(Q(title__icontains=keywords) | Q(body__icontains=keywords))
-
@decorators.render('questions.html')
def question_search(request, keywords):
- initial = do_question_search(keywords)
+ initial = Question.objects.search(keywords)
return question_list(request, initial, _("questions matching '%(keywords)s'") % {'keywords': keywords},
base_path="%s?t=question&q=%s" % (reverse('search'), django_urlquote(keywords)), sort=False)
-
+
def tags(request):#view showing a listing of available tags - plain list
stag = ""
@@ -126,12 +148,12 @@ def tags(request):#view showing a listing of available tags - plain list
if request.method == "GET":
stag = request.GET.get("q", "").strip()
if stag != '':
- objects_list = Paginator(Tag.objects.filter(deleted=False).exclude(used_count=0).extra(where=['name like %s'], params=['%' + stag + '%']), DEFAULT_PAGE_SIZE)
+ objects_list = Paginator(Tag.active.filter(name__contains=stag), DEFAULT_PAGE_SIZE)
else:
if sortby == "name":
- objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("name"), DEFAULT_PAGE_SIZE)
+ objects_list = Paginator(Tag.active.order_by("name"), DEFAULT_PAGE_SIZE)
else:
- objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-used_count"), DEFAULT_PAGE_SIZE)
+ objects_list = Paginator(Tag.active.order_by("-used_count"), DEFAULT_PAGE_SIZE)
try:
tags = objects_list.page(page)
@@ -206,15 +228,19 @@ def question(request, id, slug):
page = int(request.GET.get('page', 1))
view_id, order_by = get_answer_sort_order(request)
- if question.deleted and not request.user.can_view_deleted_post(question):
+ if question.nis.deleted and not request.user.can_view_deleted_post(question):
raise Http404
- answer_form = AnswerForm(question)
+ if request.POST:
+ answer_form = AnswerForm(question, request.POST)
+ else:
+ answer_form = AnswerForm(question)
+
answers = request.user.get_visible_answers(question)
if answers is not None:
answers = [a for a in answers.order_by("-marked", order_by)
- if not a.deleted or a.author == request.user]
+ if not a.nis.deleted or a.author == request.user]
objects_list = Paginator(answers, ANSWERS_PAGE_SIZE)
page_objects = objects_list.page(page)
@@ -274,7 +300,7 @@ def revisions(request, id):
rev_ctx[i]['summary'] = _('Revision n. %(rev_number)d') % {'rev_number': revision.revision}
else:
rev_ctx[i]['summary'] = revision.summary
-
+
return render_to_response('revisions.html', {
'post': post,
'revisions': rev_ctx,