X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/cae97f07277a1a00607d8a16e24a047dd17ec41a..988c0eb318f4af28bad7d7714e7410699d7cae30:/forum/views/readers.py diff --git a/forum/views/readers.py b/forum/views/readers.py index 17cea0f..07f6a3f 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -1,10 +1,10 @@ -# encoding:utf-8 +# encoding:utf-8 import datetime import logging from urllib import unquote 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.http import HttpResponseRedirect, HttpResponse, Http404, HttpResponsePermanentRedirect from django.core.paginator import Paginator, EmptyPage, InvalidPage from django.template import RequestContext from django import template @@ -20,13 +20,14 @@ from django.utils.http import urlquote as django_urlquote from django.template.defaultfilters import slugify from django.utils.safestring import mark_safe -from forum.utils.html import sanitize_html +from forum.utils.html import sanitize_html, hyperlink from forum.utils.diff import textDiff as htmldiff from forum.forms import * from forum.models import * -from forum.utils.forms import get_next_url +from forum.forms import get_next_url from forum.actions import QuestionViewAction -from forum.modules.decorators import decoratable +from forum.http_responses import HttpResponseUnauthorized +from forum.feed import RssQuestionFeed import decorators # used in index page @@ -41,23 +42,32 @@ QUESTIONS_PAGE_SIZE = 30 # used in answers ANSWERS_PAGE_SIZE = 10 +def feed(request): + return RssQuestionFeed( + Question.objects.filter_state(deleted=False).order_by('-last_activity_at'), + settings.APP_TITLE + _(' - ')+ _('latest questions'), + settings.APP_DESCRIPTION, + request)(request) + + @decorators.render('index.html') def index(request): return question_list(request, Question.objects.all(), sort=request.utils.set_sort_method('active'), - base_path=reverse('questions')) + base_path=reverse('questions'), + feed_url=reverse('latest_questions_feed')) -@decorators.render('questions.html', 'unanswered') +@decorators.render('questions.html', 'unanswered', _('unanswered'), weight=400) def unanswered(request): 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")) + _("Unanswered Questions")) -@decorators.render('questions.html', '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')) @@ -68,15 +78,52 @@ def tag(request, tag): mark_safe(_('questions tagged %(tag)s') % {'tag': tag}), request.utils.set_sort_method('active'), None, - mark_safe(_('questions tagged %(tag)s') % {'tag': tag}), + mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}), False) +@decorators.render('questions.html', 'questions', tabbed=False) +def user_questions(request, mode, user, slug): + user = get_object_or_404(User, id=user) + + if mode == _('asked-by'): + questions = Question.objects.filter(author=user) + description = _("Questions asked by %s") + elif mode == _('answered-by'): + questions = Question.objects.filter(children__author=user, children__node_type='answer').distinct() + description = _("Questions answered by %s") + elif mode == _('subscribed-by'): + if not (request.user.is_superuser or request.user == user): + return HttpResponseUnauthorized(request) + questions = user.subscriptions + + if request.user == user: + description = _("Questions you subscribed %s") + else: + description = _("Questions subscribed by %s") + else: + raise Http404 + + + 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) + + @decorators.list('questions', QUESTIONS_PAGE_SIZE) -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) +def question_list(request, initial, + list_description=_('questions'), + sort=None, + base_path=None, + page_title=_("All Questions"), + allowIgnoreTags=True, + feed_url=None): + + questions = initial.filter_state(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'))) + 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: @@ -91,17 +138,35 @@ def question_list(request, initial, list_description=_('questions'), sort=None, if page_title is None: page_title = _("Questions") - answer_count = Answer.objects.filter(deleted=None, parent__in=questions).count() + if request.GET.get('type', None) == 'rss': + return RssQuestionFeed(questions, page_title, list_description, request)(request) + + 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") + + 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')]) + if req_params: + req_params = '&' + req_params + + feed_url = mark_safe(request.path + "?type=rss" + req_params) return { - "questions" : questions, - "questions_count" : questions.count(), - "answer_count" : answer_count, - #"tags_autocomplete" : _get_tags_cache_json(), - "list_description": list_description, - "base_path" : base_path, - "page_title" : page_title, - } + "questions" : questions, + "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", + 'feed_url': feed_url, + } def search(request): @@ -112,27 +177,27 @@ def search(request): 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) + return question_list(request, initial, + _("questions matching '%(keywords)s'") % {'keywords': keywords}, + False, + "%s?t=question&q=%s" % (reverse('search'),django_urlquote(keywords)), + _("questions matching '%(keywords)s'") % {'keywords': keywords}) -def tags(request):#view showing a listing of available tags - plain list +@decorators.render('tags.html', 'tags', _('tags'), weight=100) +def tags(request): stag = "" is_paginated = True sortby = request.GET.get('sort', 'used') @@ -144,34 +209,34 @@ 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) except (EmptyPage, InvalidPage): tags = objects_list.page(objects_list.num_pages) - return render_to_response('tags.html', { - "tags" : tags, - "stag" : stag, - "tab_id" : sortby, - "keywords" : stag, - "context" : { - 'is_paginated' : is_paginated, - 'pages': objects_list.num_pages, - 'page': page, - 'has_previous': tags.has_previous(), - 'has_next': tags.has_next(), - 'previous': tags.previous_page_number(), - 'next': tags.next_page_number(), - 'base_url' : reverse('tags') + '?sort=%s&' % sortby - } - }, context_instance=RequestContext(request)) + return { + "tags" : tags, + "stag" : stag, + "tab_id" : sortby, + "keywords" : stag, + "context" : { + 'is_paginated' : is_paginated, + 'pages': objects_list.num_pages, + 'page': page, + 'has_previous': tags.has_previous(), + 'has_next': tags.has_next(), + 'previous': tags.previous_page_number(), + 'next': tags.next_page_number(), + 'base_url' : reverse('tags') + '?sort=%s&' % sortby + } + } def get_answer_sort_order(request): view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score" } @@ -190,7 +255,7 @@ def update_question_view_times(request, question): if not 'last_seen_in_question' in request.session: request.session['last_seen_in_question'] = {} - last_seen = request.session['last_seen_in_question'].get(question.id,None) + last_seen = request.session['last_seen_in_question'].get(question.id, None) if (not last_seen) or last_seen < question.last_activity_at: QuestionViewAction(question, request.user, ip=request.META['REMOTE_ADDR']).save() @@ -200,7 +265,7 @@ def update_question_view_times(request, question): def match_question_slug(slug): slug_words = slug.split('-') - qs = Question.objects.filter(node_type="question", title__istartswith=slug_words[0]) + qs = Question.objects.filter(title__istartswith=slug_words[0]) for q in qs: if slug == urlquote(slugify(q.title)): @@ -210,29 +275,31 @@ def match_question_slug(slug): def question(request, id, slug): try: - question = Question.objects.get(node_type="question", id=id) + question = Question.objects.get(id=id) except: - question = match_question_slug(slug) - if question is not None: - return HttpResponsePermanentRedirect(question.get_absolute_url()) - else: - raise Http404() + if slug: + question = match_question_slug(slug) + if question is not None: + return HttpResponsePermanentRedirect(question.get_absolute_url()) - if slug != urlquote(slugify(question.title)): - return HttpResponsePermanentRedirect(question.get_absolute_url()) + raise Http404() 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) @@ -248,24 +315,24 @@ def question(request, id, slug): subscription = False return render_to_response('question.html', { - "question" : question, - "answer" : answer_form, - "answers" : page_objects.object_list, - "tab_id" : view_id, - "similar_questions" : question.get_related_questions(), - "subscription": subscription, - "context" : { - 'is_paginated' : True, - 'pages': objects_list.num_pages, - 'page': page, - 'has_previous': page_objects.has_previous(), - 'has_next': page_objects.has_next(), - 'previous': page_objects.previous_page_number(), - 'next': page_objects.next_page_number(), - 'base_url' : request.path + '?sort=%s&' % view_id, - 'extend_url' : "#sort-top" - } - }, context_instance=RequestContext(request)) + "question" : question, + "answer" : answer_form, + "answers" : page_objects.object_list, + "tab_id" : view_id, + "similar_questions" : question.get_related_questions(), + "subscription": subscription, + "context" : { + 'is_paginated' : True, + 'pages': objects_list.num_pages, + 'page': page, + 'has_previous': page_objects.has_previous(), + 'has_next': page_objects.has_next(), + 'previous': page_objects.previous_page_number(), + 'next': page_objects.next_page_number(), + 'base_url' : request.path + '?sort=%s&' % view_id, + 'extend_url' : "#sort-top" + } + }, context_instance=RequestContext(request)) REVISION_TEMPLATE = template.loader.get_template('node/revision.html') @@ -273,14 +340,13 @@ 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): - rev_ctx.append(dict(inst=revision, html=REVISION_TEMPLATE.render(template.Context({ - 'title': revision.title, - 'html': revision.html, - 'tags': revision.tagname_list(), + rev_ctx.append(dict(inst=revision, html=template.loader.get_template('node/revision.html').render(template.Context({ + 'title': revision.title, + 'html': revision.html, + 'tags': revision.tagname_list(), })))) if i > 0: @@ -293,10 +359,12 @@ def revisions(request, id): else: rev_ctx[i]['summary'] = revision.summary + rev_ctx.reverse() + return render_to_response('revisions.html', { - 'post': post, - 'revisions': rev_ctx, - }, context_instance=RequestContext(request)) + 'post': post, + 'revisions': rev_ctx, + }, context_instance=RequestContext(request))