From 50c880ac0f0d9fa90244aa8165b53a8968ae3a1a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 22 May 2011 17:06:11 -0500 Subject: [PATCH] A more explicit version of get_page_url that doesn't use the request is still an option now ;) --- mediagoblin/util.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/mediagoblin/util.py b/mediagoblin/util.py index f56bea43..2865cf11 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -351,13 +351,20 @@ class Pagination(object): yield num last = num - def get_page_url(self, request, page_no): + def get_page_url_explicit(self, base_url, get_params, page_no): """ - Get a new page url based of the request, and the new page number. + Get a page url by adding a page= parameter to the base url """ - path_info = request.path_info - get_params = request.GET 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)