Fixes some problems with urlquoting on seraches.

[osqa.git] / forum / views / readers.py

diff --git a/forum/views/readers.py b/forum/views/readers.py
index c86794f308a48893d64a25510975cbfe0018c1a4..6e75b378a1572b2900f78933db16bdeab4157f69 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -52,7 +52,7 @@ def index(request):
 def unanswered(request):
     return question_list(request,
                          Question.objects.filter(extra_ref=None),
 def unanswered(request):
     return question_list(request,
                          Question.objects.filter(extra_ref=None),

-                         _('Open questions without an accepted answer'),
+                         _('open questions without an accepted answer'),

                          request.utils.set_sort_method('active'),
                          None,
                          _("Unanswered questions"))
                          request.utils.set_sort_method('active'),
                          None,
                          _("Unanswered questions"))


@@ -65,15 +65,15 @@ def questions(request):
 def tag(request, tag):
     return question_list(request,
                          Question.objects.filter(tags__name=unquote(tag)),
 def tag(request, tag):
     return question_list(request,
                          Question.objects.filter(tags__name=unquote(tag)),

-                         mark_safe(_('Questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
+                         mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),

                          request.utils.set_sort_method('active'),
                          None,
                          request.utils.set_sort_method('active'),
                          None,

-                         mark_safe(_('Questions tagged %(tag)s') % {'tag': tag}),
+                         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, page_title=None, allowIgnoreTags=True):
                          False)
 
 @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)
+    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')))
 
     if request.user.is_authenticated() and allowIgnoreTags:
         questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad')))


@@ -91,13 +91,24 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
     if page_title is None:
         page_title = _("Questions")
 
     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(),
     return {
         "questions" : questions,
         "questions_count" : questions.count(),

+        "answer_count" : answer_count,
+        "keywords" : keywords,

         #"tags_autocomplete" : _get_tags_cache_json(),
         "list_description": list_description,
         #"tags_autocomplete" : _get_tags_cache_json(),
         "list_description": list_description,

+        "answer_description": answer_description,

         "base_path" : base_path,
         "page_title" : page_title,
         "base_path" : base_path,
         "page_title" : page_title,

+        "tab" : "questions",

         }
 
 
         }
 
 


@@ -109,21 +120,17 @@ def search(request):
         if not keywords:
             return HttpResponseRedirect(reverse(index))
         if search_type == 'tag':
         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":
         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))
 
         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):
 @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},
             base_path="%s?t=question&q=%s" % (reverse('search'), django_urlquote(keywords)), sort=False)


@@ -141,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 != '':
     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":
         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:
             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)
 
     try:
         tags = objects_list.page(page)


@@ -221,15 +228,19 @@ def question(request, id, slug):
     page = int(request.GET.get('page', 1))
     view_id, order_by = get_answer_sort_order(request)
 
     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
 
         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)
     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)
 
     objects_list = Paginator(answers, ANSWERS_PAGE_SIZE)
     page_objects = objects_list.page(page)