A couple more fixes.

[osqa.git] / forum / utils / pagination.py

diff --git a/forum/utils/pagination.py b/forum/utils/pagination.py
index 5951b3384c22a7d324f88548d89e3df574be33af..4a3ebd6682ecd6cc49cb0c79ee2036fb84521777 100644 (file)
--- a/forum/utils/pagination.py
+++ b/forum/utils/pagination.py
@@ -4,11 +4,21 @@ from django import template
 from django.core.paginator import Paginator, EmptyPage
 from django.utils.translation import ugettext as _
 from django.http import Http404
 from django.core.paginator import Paginator, EmptyPage
 from django.utils.translation import ugettext as _
 from django.http import Http404

+from django.utils.http import urlquote

 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags

-
+from forum.utils.html import sanitize_html

 import logging
 
 import logging
 

+def generate_uri(querydict, exclude=None):
+    all = []
+
+    for k, l in querydict.iterlists():
+        if (not exclude) or (not k in exclude):
+            all += ["%s=%s" % (k, urlquote(strip_tags(v))) for v in l]
+        
+    return "&".join(all)
+

 class SortBase(object):
     def __init__(self, label, description=''):
         self.label = label
 class SortBase(object):
     def __init__(self, label, description=''):
         self.label = label


@@ -107,7 +117,7 @@ class PaginatorContext(object):
 
     def page(self, request):
         try:
 
     def page(self, request):
         try:

-            return int(request.GET.get(self.PAGE, 1))
+            return int(request.GET.get(self.PAGE, "1").strip())

         except ValueError:
             logging.error('Found invalid page number "%s", loading %s, refered by %s' % (
                 request.GET.get(self.PAGE, ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN')
         except ValueError:
             logging.error('Found invalid page number "%s", loading %s, refered by %s' % (
                 request.GET.get(self.PAGE, ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN')


@@ -189,10 +199,10 @@ def _paginated(request, objects, context):
         base_path = context.base_path
     else:
         base_path = request.path
         base_path = context.base_path
     else:
         base_path = request.path

-        get_params = ["%s=%s" % (k, v) for k, v in request.GET.items() if not k in (context.PAGE, context.PAGESIZE, context.SORT)]
+        get_params = generate_uri(request.GET, (context.PAGE, context.PAGESIZE, context.SORT))

 
         if get_params:
 
         if get_params:

-            base_path += "?" + "&".join(get_params)
+            base_path += "?" + get_params

 
     url_joiner = "?" in base_path and "&" or "?"
 
 
     url_joiner = "?" in base_path and "&" or "?"
 


@@ -283,6 +293,9 @@ def _paginated(request, objects, context):
             url_builder = lambda s: mark_safe("%s%s%s=%s" % (base_path, url_joiner, context.SORT, s))
             sorts = [(n, s.label, url_builder(n), strip_tags(s.description)) for n, s in context.sort_methods.items()]
 
             url_builder = lambda s: mark_safe("%s%s%s=%s" % (base_path, url_joiner, context.SORT, s))
             sorts = [(n, s.label, url_builder(n), strip_tags(s.description)) for n, s in context.sort_methods.items()]
 

+            for name, label, url, descr in sorts:
+                paginator.__dict__['%s_sort_link' % name] = url
+

             return sort_tabs_template.render(template.Context({
                 'current': sort,
                 'sorts': sorts,
             return sort_tabs_template.render(template.Context({
                 'current': sort,
                 'sorts': sorts,


@@ -290,8 +303,10 @@ def _paginated(request, objects, context):
             }))
         paginator.sort_tabs = sort_tabs()
         paginator.sort_description = mark_safe(context.sort_methods[sort].description)
             }))
         paginator.sort_tabs = sort_tabs()
         paginator.sort_description = mark_safe(context.sort_methods[sort].description)

+        paginator.current_sort = sort

     else:
         paginator.sort_tabs = paginator.sort_description = ''
     else:
         paginator.sort_tabs = paginator.sort_description = ''

+        paginator.current_sort = ''

 
     context.set_preferences(request, session_prefs)
     objects.paginator = paginator
 
     context.set_preferences(request, session_prefs)
     objects.paginator = paginator