X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..42fc66b154f719a3e55a8dff942bf0c381af896f:/forum/views/readers.py diff --git a/forum/views/readers.py b/forum/views/readers.py index 53236d5..b865fbb 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -1,12 +1,13 @@ -# encoding:utf-8 +# encoding:utf-8 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 +from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404, HttpResponsePermanentRedirect from django.core.paginator import Paginator, EmptyPage, InvalidPage 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 @@ -20,13 +21,12 @@ from django.template.defaultfilters import slugify from django.utils.safestring import mark_safe from forum.utils.html import sanitize_html -from markdown2 import Markdown 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,65 +41,74 @@ QUESTIONS_PAGE_SIZE = 30 # used in answers ANSWERS_PAGE_SIZE = 10 -markdowner = Markdown(html4tags=True) - -#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='latest', 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(answer_accepted=False), - _('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): - pagesize = request.utils.page_size(QUESTIONS_PAGE_SIZE) - page = int(request.GET.get('page', 1)) +def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None, allowIgnoreTags=True): + questions = initial.filter(deleted=None, in_moderation=None) - questions = initial.filter(deleted=False) + if request.user.is_authenticated() and allowIgnoreTags: + questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad'))) - if request.user.is_authenticated(): - 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: + sort = request.utils.sort_method('latest') + else: + request.utils.set_sort_method(sort) - if sort is None: - sort = request.utils.sort_method('latest') - 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')) + 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(deleted=None, parent__in=questions).count() + answer_description = _("answers") return { "questions" : questions, "questions_count" : questions.count(), - "tags_autocomplete" : _get_tags_cache_json(), + "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", } @@ -107,7 +116,7 @@ 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': @@ -119,19 +128,17 @@ 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, orderby): - return Question.objects.filter(Q(title__icontains=keywords) | Q(html__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))) - + 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 = "" @@ -188,23 +195,39 @@ def get_answer_sort_order(request): return (view_id, view_dic[view_id]) def update_question_view_times(request, question): - if not 'question_view_times' in request.session: - request.session['question_view_times'] = {} + if not 'last_seen_in_question' in request.session: + request.session['last_seen_in_question'] = {} - last_seen = request.session['question_view_times'].get(question.id,None) - updated_when, updated_who = question.get_last_update_info() + last_seen = request.session['last_seen_in_question'].get(question.id,None) - if not last_seen or last_seen < updated_when: - question.view_count = question.view_count + 1 - question_view.send(sender=update_question_view_times, instance=question, user=request.user) + 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['question_view_times'][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(node_type="question", title__istartswith=slug_words[0]) + + for q in qs: + if slug == urlquote(slugify(q.title)): + return q + + return None def question(request, id, slug): - question = get_object_or_404(Question, id=id) + try: + question = Question.objects.get(node_type="question", id=id) + except: + question = match_question_slug(slug) + if question is not None: + return HttpResponsePermanentRedirect(question.get_absolute_url()) + else: + raise Http404() if slug != urlquote(slugify(question.title)): - return HttpResponseRedirect(question.get_absolute_url()) + return HttpResponsePermanentRedirect(question.get_absolute_url()) page = int(request.GET.get('page', 1)) view_id, order_by = get_answer_sort_order(request) @@ -212,11 +235,15 @@ def question(request, id, slug): if question.deleted and not request.user.can_view_deleted_post(question): raise Http404 - answer_form = AnswerForm(question,request.user) + 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("-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) @@ -236,7 +263,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, @@ -254,51 +280,35 @@ def question(request, id, slug): }, context_instance=RequestContext(request)) -QUESTION_REVISION_TEMPLATE = ('

%(title)s

\n' - '
%(html)s
\n' - '
%(tags)s
') -def question_revisions(request, id): - post = get_object_or_404(Question, id=id) - revisions = list(post.revisions.all()) - revisions.reverse() +REVISION_TEMPLATE = template.loader.get_template('node/revision.html') + +def revisions(request, id): + post = get_object_or_404(Node, id=id).leaf + revisions = list(post.revisions.order_by('revised_at')) + + rev_ctx = [] + for i, revision in enumerate(revisions): - revision.html = QUESTION_REVISION_TEMPLATE % { - 'title': revision.title, - 'html': sanitize_html(markdowner.convert(revision.text)), - 'tags': ' '.join(['%s' % tag - for tag in revision.tagnames.split(' ')]), - } + rev_ctx.append(dict(inst=revision, html=REVISION_TEMPLATE.render(template.Context({ + 'title': revision.title, + 'html': revision.html, + 'tags': revision.tagname_list(), + })))) + if i > 0: - revisions[i].diff = htmldiff(revisions[i-1].html, revision.html) + rev_ctx[i]['diff'] = mark_safe(htmldiff(rev_ctx[i-1]['html'], rev_ctx[i]['html'])) else: - revisions[i].diff = QUESTION_REVISION_TEMPLATE % { - 'title': revisions[0].title, - 'html': sanitize_html(markdowner.convert(revisions[0].text)), - 'tags': ' '.join(['%s' % tag - for tag in revisions[0].tagnames.split(' ')]), - } - revisions[i].summary = _('initial version') - return render_to_response('revisions_question.html', { - 'post': post, - 'revisions': revisions, - }, context_instance=RequestContext(request)) + rev_ctx[i]['diff'] = mark_safe(rev_ctx[i]['html']) -ANSWER_REVISION_TEMPLATE = ('
%(html)s
') -def answer_revisions(request, id): - post = get_object_or_404(Answer, id=id) - revisions = list(post.revisions.all()) - revisions.reverse() - for i, revision in enumerate(revisions): - revision.html = ANSWER_REVISION_TEMPLATE % { - 'html': sanitize_html(markdowner.convert(revision.text)) - } - if i > 0: - revisions[i].diff = htmldiff(revisions[i-1].html, revision.html) + if not (revision.summary): + rev_ctx[i]['summary'] = _('Revision n. %(rev_number)d') % {'rev_number': revision.revision} else: - revisions[i].diff = revisions[i].text - revisions[i].summary = _('initial version') - return render_to_response('revisions_answer.html', { + rev_ctx[i]['summary'] = revision.summary + + return render_to_response('revisions.html', { 'post': post, - 'revisions': revisions, + 'revisions': rev_ctx, }, context_instance=RequestContext(request)) + +