Fix in the retag template.

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

diff --git a/forum/utils/pagination.py b/forum/utils/pagination.py
index 1d36b42d704a08d6e37f7f108fd2481611cc4bc1..f607cd0406bcbc676590a0df16d2b533cd003b62 100644 (file)
--- a/forum/utils/pagination.py
+++ b/forum/utils/pagination.py
@@ -204,14 +204,14 @@ def _paginated(request, objects, context):
         if get_params:
             base_path += "?" + get_params
 
         if get_params:
             base_path += "?" + get_params
 

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

 
 
     def get_page():
         object_list = page_obj.object_list
 
 
 
     def get_page():
         object_list = page_obj.object_list
 

-        if hasattr(object_list, 'lazy'):
-            return object_list.lazy()
+        #if hasattr(object_list, 'lazy'):
+        #    return object_list.lazy()

         return object_list
     paginator.page = get_page()
 
         return object_list
     paginator.page = get_page()
 


@@ -240,9 +240,9 @@ def _paginated(request, objects, context):
             page_numbers = []
 
             if sort:
             page_numbers = []
 
             if sort:

-                url_builder = lambda n: mark_safe("%s%s%s=%s&%s=%s" % (base_path, url_joiner, context.SORT, sort, context.PAGE, n))
+                url_builder = lambda n: mark_safe("%s%s%s=%s&%s=%s" % (escape(base_path), url_joiner, context.SORT, sort, context.PAGE, n))

             else:
             else:

-                url_builder = lambda n: mark_safe("%s%s%s=%s" % (base_path, url_joiner, context.PAGE, n))
+                url_builder = lambda n: mark_safe("%s%s%s=%s" % (escape(base_path), url_joiner, context.PAGE, n))

 
             if range_start > (context.outside_page_range + 1):
                 page_numbers.append([(n, url_builder(n)) for n in range(1, context.outside_page_range + 1)])
 
             if range_start > (context.outside_page_range + 1):
                 page_numbers.append([(n, url_builder(n)) for n in range(1, context.outside_page_range + 1)])


@@ -273,7 +273,7 @@ def _paginated(request, objects, context):
     if pagesize:
         def page_sizes():
             if sort:
     if pagesize:
         def page_sizes():
             if sort:

-                url_builder = lambda s: mark_safe("%s%s%s=%s&%s=%s" % (escape(base_path), url_joiner, context.SORT, sort, context.PAGESIZE, s))
+                url_builder = lambda s: mark_safe("%s%s%s=%s&%s=%s" % (escape(base_path), url_joiner, context.SORT, sort, context.PAGESIZE, s))

             else:
                 url_builder = lambda s: mark_safe("%s%s%s=%s" % (escape(base_path), url_joiner, context.PAGESIZE, s))
 
             else:
                 url_builder = lambda s: mark_safe("%s%s%s=%s" % (escape(base_path), url_joiner, context.PAGESIZE, s))