X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/9b450de133375fb612625b826f1920b672ab2acc..f241c71f15e002848cf9527c7141063c6c5e5bf8:/forum/views/readers.py
diff --git a/forum/views/readers.py b/forum/views/readers.py
index ac20dae..bac3c0c 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -2,7 +2,7 @@
import datetime
import logging
from urllib import unquote
-from django.conf import settings as django_settings
+from forum import settings as django_settings
from django.shortcuts import render_to_response, get_object_or_404
from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404, HttpResponsePermanentRedirect
from django.core.paginator import Paginator, EmptyPage, InvalidPage
@@ -24,9 +24,9 @@ from forum.utils.html import sanitize_html
from forum.utils.diff import textDiff as htmldiff
from forum.forms import *
from forum.models import *
-from forum.const import *
from forum.utils.forms import get_next_url
-from forum.models.question import question_view
+from forum.actions import QuestionViewAction
+from forum.modules.decorators import decoratable
import decorators
# used in index page
@@ -41,43 +41,29 @@ QUESTIONS_PAGE_SIZE = 30
# used in answers
ANSWERS_PAGE_SIZE = 10
-#system to display main content
-def _get_tags_cache_json():#service routine used by views requiring tag list in the javascript space
- """returns list of all tags in json format
- no caching yet, actually
- """
- tags = Tag.objects.filter(deleted=False).all()
- tags_list = []
- for tag in tags:
- dic = {'n': tag.name, 'c': tag.used_count}
- tags_list.append(dic)
- tags = simplejson.dumps(tags_list)
- return tags
-
@decorators.render('index.html')
def index(request):
return question_list(request, Question.objects.all(), sort='active', base_path=reverse('questions'))
@decorators.render('questions.html', 'unanswered')
def unanswered(request):
- return question_list(request, Question.objects.filter(accepted_answer=None),
- _('Open questions without an accepted answer'))
+ return question_list(request, Question.objects.filter(extra_ref=None),
+ _('Open questions without an accepted answer'),
+ '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'), '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}))
+ mark_safe(_('Questions tagged %(tag)s') % {'tag': tag}),
+ 'active', None, mark_safe(_('Questions tagged %(tag)s') % {'tag': tag}))
@decorators.list('questions', QUESTIONS_PAGE_SIZE)
-def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None):
- pagesize = request.utils.page_size(QUESTIONS_PAGE_SIZE)
- page = int(request.GET.get('page', 1))
-
- questions = initial.filter(deleted=False)
+def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None):
+ questions = initial.filter(deleted=None, in_moderation=None)
if request.user.is_authenticated():
questions = questions.filter(
@@ -89,16 +75,20 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
else:
request.utils.set_sort_method(sort)
- view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+ view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-extra_count", "mostvoted":"-score" }
questions=questions.order_by(view_dic.get(sort, '-added_at'))
+ if page_title is None:
+ page_title = _("Questions")
+
return {
"questions" : questions,
"questions_count" : questions.count(),
- "tags_autocomplete" : _get_tags_cache_json(),
+ #"tags_autocomplete" : _get_tags_cache_json(),
"list_description": list_description,
"base_path" : base_path,
+ "page_title" : page_title,
}
@@ -118,15 +108,13 @@ def search(request):
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):
- def question_search(keywords):
- return Question.objects.filter(Q(title__icontains=keywords) | Q(body__icontains=keywords))
-
- from forum.modules import get_handler
-
- question_search = get_handler('question_search', question_search)
- initial = question_search(keywords)
+ initial = do_question_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)
@@ -193,14 +181,14 @@ def update_question_view_times(request, question):
last_seen = request.session['last_seen_in_question'].get(question.id,None)
if (not last_seen) or last_seen < question.last_activity_at:
- question_view.send(sender=update_question_view_times, instance=question, user=request.user)
+ 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()
def match_question_slug(slug):
slug_words = slug.split('-')
- qs = Question.objects.filter(title__istartswith=slug_words[0])
+ qs = Question.objects.filter(node_type="question", title__istartswith=slug_words[0])
for q in qs:
if slug == urlquote(slugify(q.title)):
@@ -231,7 +219,7 @@ def question(request, id, slug):
answers = request.user.get_visible_answers(question)
if answers is not None:
- answers = [a for a in answers.order_by("-accepted", order_by)
+ answers = [a for a in answers.order_by("-marked", order_by)
if not a.deleted or a.author == request.user]
objects_list = Paginator(answers, ANSWERS_PAGE_SIZE)
@@ -251,7 +239,6 @@ def question(request, id, slug):
"question" : question,
"answer" : answer_form,
"answers" : page_objects.object_list,
- "tags" : question.tags.all(),
"tab_id" : view_id,
"similar_questions" : question.get_related_questions(),
"subscription": subscription,
@@ -294,7 +281,7 @@ def revisions(request, id):
else:
rev_ctx[i]['summary'] = revision.summary
- return render_to_response('revisions_question.html', {
+ return render_to_response('revisions.html', {
'post': post,
'revisions': rev_ctx,
}, context_instance=RequestContext(request))