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 b260343d19e97e6b79e51b13f73c27a1cbb59263..385a4bee2c7e15b4aa0bedafceb7a80c50ae953e 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -4,7 +4,7 @@ import logging
 from urllib import unquote
 from django.conf 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
@@ -56,7 +56,7 @@ def _get_tags_cache_json():#service routine used by views requiring tag list in
 
 @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='active', base_path=reverse('questions'))
 
 @decorators.render('questions.html', 'unanswered')
 def unanswered(request):
@@ -96,7 +96,7 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
     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,
         }
@@ -120,8 +120,8 @@ def search(request):
 
 @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
 
@@ -198,11 +198,28 @@ def update_question_view_times(request, question):
 
     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)