fixes osqa-54: The user was not being informed that they were trying to submit a...

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 2e2c002fc9fec384f80f2f76002a1678e2f03205..385a4bee2c7e15b4aa0bedafceb7a80c50ae953e 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -96,7 +96,7 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
     return {
         "questions" : questions,
         "questions_count" : questions.count(),
     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,
         }
         "list_description": list_description,
         "base_path" : base_path,
         }


@@ -120,8 +120,8 @@ def search(request):
 
 @decorators.render('questions.html')
 def question_search(request, 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))
+    def question_search(keywords):
+        return Question.objects.filter(Q(title__icontains=keywords) | Q(body__icontains=keywords))

 
     from forum.modules import get_handler
 
 
     from forum.modules import get_handler
 


@@ -200,7 +200,7 @@ def update_question_view_times(request, question):
 
 def match_question_slug(slug):
     slug_words = slug.split('-')
 
 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)):
 
     for q in qs:
         if slug == urlquote(slugify(q.title)):


@@ -210,7 +210,7 @@ def match_question_slug(slug):
 
 def question(request, id, slug):
     try:
 
 def question(request, id, slug):
     try:

-        question = Question.objects.get(id=id)
+        question = Question.objects.get(node_type="question", id=id)

     except:
         question = match_question_slug(slug)
         if question is not None:
     except:
         question = match_question_slug(slug)
         if question is not None: