X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/9476f5750fe4a456c6624e965fbd3a922a85919d..674a5ea3ae34558422e22d7b43bae7032b2b7cd7:/forum/views/readers.py

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 2878424..67d2c38 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -108,7 +108,7 @@ def tag(request, tag):
         raise Http404
 
     # Getting the questions QuerySet
-    questions = Question.objects.filter(tags__name=smart_unicode(tag.name))
+    questions = Question.objects.filter(tags__id=tag.id)
 
     if request.method == "GET":
         user = request.GET.get('user', None)
@@ -121,9 +121,9 @@ def tag(request, tag):
 
     return question_list(request,
                          questions,
-                         mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
+                         mark_safe(_(u'questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
                          None,
-                         mark_safe(_('Questions Tagged With %(tag)s') % {'tag': tag}),
+                         mark_safe(_(u'Questions Tagged With %(tag)s') % {'tag': tag}),
                          False)
 
 @decorators.render('questions.html', 'questions', tabbed=False)
@@ -181,11 +181,11 @@ def question_list(request, initial,
     #answer_description = _("answers")
 
     if not feed_url:
-        req_params = "&".join(generate_uri(request.GET, (_('page'), _('pagesize'), _('sort'))))
+        req_params = generate_uri(request.GET, (_('page'), _('pagesize'), _('sort')))
         if req_params:
             req_params = '&' + req_params
 
-        feed_url = mark_safe(escape(request.path + "?type=rss" + req_params))
+        feed_url = request.path + "?type=rss" + req_params
 
     return pagination.paginated(request, ('questions', paginator_context or QuestionListPaginatorContext()), {
     "questions" : questions.distinct(),
@@ -220,8 +220,13 @@ def question_search(request, keywords):
     can_rank, initial = Question.objects.search(keywords)
 
     if can_rank:
+        sort_order = None
+
+        if isinstance(can_rank, basestring):
+            sort_order = can_rank
+
         paginator_context = QuestionListPaginatorContext()
-        paginator_context.sort_methods[_('ranking')] = pagination.SimpleSort(_('relevance'), '-ranking', _("most relevant questions"))
+        paginator_context.sort_methods[_('ranking')] = pagination.SimpleSort(_('relevance'), sort_order, _("most relevant questions"))
         paginator_context.force_sort = _('ranking')
     else:
         paginator_context = None