First changes to media gallery view

[mediagoblin.git] / mediagoblin / util.py

diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index d37d160eea327a4000476632102b62fa6e53ca3b..2865cf11504f39bec4271f88bca9fe0183fa3c00 100644 (file)
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -29,8 +29,6 @@ from mediagoblin import globals as mgoblin_globals
 import urllib
 from math import ceil
 import copy
-import decorators
-from webob import exc
 
 TESTS_ENABLED = False
 def _activate_testing():
@@ -353,13 +351,20 @@ class Pagination(object):
                 yield num
                 last = num
 
-    def get_page_url(self, path_info, page_no, get_params=None):
+    def get_page_url_explicit(self, base_url, get_params, page_no):
         """ 
-        Get a new page based of the path_info, the new page number,
-        and existing get parameters.
+        Get a page url by adding a page= parameter to the base url
         """ 
         new_get_params = copy.copy(get_params or {})
         new_get_params['page'] = page_no
         return "%s?%s" % (
-            path_info, urllib.urlencode(new_get_params))
-    
+            base_url, urllib.urlencode(new_get_params))
+
+    def get_page_url(self, request, page_no):
+        """ 
+        Get a new page url based of the request, and the new page number.
+
+        This is a nice wrapper around get_page_url_explicit()
+        """ 
+        return self.get_page_url_explicit(
+            request.path_info, request.GET, page_no)