made it so that when you are searching questions the questions tab is highlighted

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 42950a977b47a35c45dee6a622be980eedb73576..b865fbb0dc2b91f9ddef69b6928b66e698c5ac8f 100644 (file)
--- 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
 import datetime
 import logging
 from urllib import unquote


@@ -43,34 +43,39 @@ ANSWERS_PAGE_SIZE = 10
 
 @decorators.render('index.html')
 def index(request):
 
 @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):
 
 @decorators.render('questions.html', 'unanswered')
 def unanswered(request):

-    return question_list(request, Question.objects.filter(extra_ref=None),
-                         _('Open questions without an accepted answer'),
-                         'active', None, _("Unanswered questions"))
+    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):
 
 @decorators.render('questions.html', 'questions')
 def questions(request):

-    return question_list(request, Question.objects.all(), _('questions'), 'active')
+    return question_list(request, Question.objects.all(), _('questions'), request.utils.set_sort_method('active'))

 
 @decorators.render('questions.html')
 def tag(request, tag):
 
 @decorators.render('questions.html')
 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}),
-                        'active',
-                        None,
-                        mark_safe(_('Questions tagged %(tag)s') % {'tag': tag}),
-                        True)
+    return question_list(request,
+                         Question.objects.filter(tags__name=unquote(tag)),
+                         mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
+                         request.utils.set_sort_method('active'),
+                         None,
+                         mark_safe(_('questions tagged %(tag)s') % {'tag': tag}),
+                         False)

 
 @decorators.list('questions', QUESTIONS_PAGE_SIZE)
 
 @decorators.list('questions', QUESTIONS_PAGE_SIZE)

-def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None, ignoringTags=False):
+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=None, in_moderation=None)
 

-    test = request.user.marked_tags
-
-    if request.user.is_authenticated() and  not ignoringTags:
+    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:
         questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad')))
 
     if sort is not False:


@@ -86,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(deleted=None, 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",

         }
 
 
         }
 
 


@@ -100,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 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':
         if not keywords:
             return HttpResponseRedirect(reverse(index))
         if search_type == 'tag':


@@ -122,7 +138,7 @@ def question_search(request, 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)

-    
+

 
 def tags(request):#view showing a listing of available tags - plain list
     stag = ""
 
 def tags(request):#view showing a listing of available tags - plain list
     stag = ""


@@ -219,7 +235,11 @@ def question(request, id, slug):
     if question.deleted and not request.user.can_view_deleted_post(question):
         raise Http404
 
     if question.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 = request.user.get_visible_answers(question)
 
     if answers is not None:


@@ -284,7 +304,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
             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,
     return render_to_response('revisions.html', {
                               'post': post,
                               'revisions': rev_ctx,