X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3b2f9ebad3131bb86045f3ac1d3b4f43b6d78398..47bc0543a1d3f25ec90311883b4e28186a3ddd7e:/forum/views/readers.py?ds=sidebyside

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 15ac86b..5f58344 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -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):
@@ -83,14 +83,15 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
         questions = questions.filter(
                 ~Q(tags__id__in=request.user.marked_tags.filter(user_selections__reason='bad')))
 
-    if sort is None:
-        sort = request.utils.sort_method('latest')
-    else:
-        request.utils.set_sort_method(sort)
-    
-    view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+    if sort is not False:
+        if sort is None:
+            sort = request.utils.sort_method('latest')
+        else:
+            request.utils.set_sort_method(sort)
 
-    questions=questions.order_by(view_dic.get(sort, '-added_at'))
+        view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+
+        questions=questions.order_by(view_dic.get(sort, '-added_at'))
 
     return {
         "questions" : questions,
@@ -128,7 +129,7 @@ def question_search(request, keywords):
     initial = question_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)))
+            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
@@ -197,10 +198,31 @@ 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(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(id=id)
+    except:
+        question = match_question_slug(slug)
+        if question is not None:
+            return HttpResponseRedirect(question.get_absolute_url())
+        else:
+            raise Http404()
 
     if slug != urlquote(slugify(question.title)):
+        match = match_question_slug(slug)
+        if match is not None:
+            return HttpResponseRedirect(match.get_absolute_url())    
+
         return HttpResponseRedirect(question.get_absolute_url())
 
     page = int(request.GET.get('page', 1))