Small tweaks.

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 1c4dfcc2bcf48cfcc2319d5519778bac22f7dc22..38c3c9fdc82bebc957f71daf756f1a3ca08b58a4 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -29,6 +29,7 @@ from forum.forms import get_next_url
 from forum.actions import QuestionViewAction
 from forum.http_responses import HttpResponseUnauthorized
 from forum.feed import RssQuestionFeed, RssAnswerFeed
 from forum.actions import QuestionViewAction
 from forum.http_responses import HttpResponseUnauthorized
 from forum.feed import RssQuestionFeed, RssAnswerFeed

+from forum.utils.pagination import generate_uri

 import decorators
 
 class HottestQuestionsSort(pagination.SortBase):
 import decorators
 
 class HottestQuestionsSort(pagination.SortBase):


@@ -76,7 +77,6 @@ def feed(request):
                 settings.APP_TITLE + _(' - ')+ _('latest questions'),
                 settings.APP_DESCRIPTION)(request)
 
                 settings.APP_TITLE + _(' - ')+ _('latest questions'),
                 settings.APP_DESCRIPTION)(request)
 

-

 @decorators.render('index.html')
 def index(request):
     paginator_context = QuestionListPaginatorContext()
 @decorators.render('index.html')
 def index(request):
     paginator_context = QuestionListPaginatorContext()


@@ -163,7 +163,7 @@ def question_list(request, initial,
     #answer_description = _("answers")
 
     if not feed_url:
     #answer_description = _("answers")
 
     if not feed_url:

-        req_params = "&".join(["%s=%s" % (k, v) for k, v in request.GET.items() if not k in (_('page'), _('pagesize'), _('sort'))])
+        req_params = "&".join(generate_uri(request.GET, (_('page'), _('pagesize'), _('sort'))))

         if req_params:
             req_params = '&' + req_params
 
         if req_params:
             req_params = '&' + req_params
 


@@ -243,7 +243,7 @@ def update_question_view_times(request, question):
 
     request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
 
 
     request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
 

-def match_question_slug(slug):
+def match_question_slug(id, slug):

     slug_words = slug.split('-')
     qs = Question.objects.filter(title__istartswith=slug_words[0])
 
     slug_words = slug.split('-')
     qs = Question.objects.filter(title__istartswith=slug_words[0])
 


@@ -287,7 +287,7 @@ def question(request, id, slug='', answer=None):
         question = Question.objects.get(id=id)
     except:
         if slug:
         question = Question.objects.get(id=id)
     except:
         if slug:

-            question = match_question_slug(slug)
+            question = match_question_slug(id, slug)

             if question is not None:
                 return HttpResponseRedirect(question.get_absolute_url())
 
             if question is not None:
                 return HttpResponseRedirect(question.get_absolute_url())