diff options
| author | Aditi Mittal <aditi.iitr@gmail.com> | 2013-09-18 22:23:36 +0530 |
|---|---|---|
| committer | Aditi Mittal <aditi.iitr@gmail.com> | 2013-09-18 22:23:36 +0530 |
| commit | bca32cd47401b7f41a5a3c0ca3ddd5940dcd03b1 (patch) | |
| tree | f6fd09182e86069b1aa4b7bb1721b79885b602f7 /mediagoblin/tools/pagination.py | |
| parent | 4346331c2a8084a4475c7c37e5630b5bf68d8389 (diff) | |
| parent | 28eab59acef05b5f38052941483f900d2e78c50b (diff) | |
| download | mediagoblin-bca32cd47401b7f41a5a3c0ca3ddd5940dcd03b1.tar.lz mediagoblin-bca32cd47401b7f41a5a3c0ca3ddd5940dcd03b1.tar.xz mediagoblin-bca32cd47401b7f41a5a3c0ca3ddd5940dcd03b1.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tools/pagination.py')
| -rw-r--r-- | mediagoblin/tools/pagination.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/tools/pagination.py b/mediagoblin/tools/pagination.py index d0f08c94..855878e0 100644 --- a/mediagoblin/tools/pagination.py +++ b/mediagoblin/tools/pagination.py @@ -18,7 +18,7 @@ import urllib import copy from math import ceil, floor from itertools import izip, count - +from werkzeug.datastructures import MultiDict PAGINATION_DEFAULT_PER_PAGE = 30 @@ -98,7 +98,11 @@ class Pagination(object): """ Get a page url by adding a page= parameter to the base url """ - new_get_params = dict(get_params) or {} + if isinstance(get_params, MultiDict): + new_get_params = get_params.to_dict() + else: + new_get_params = dict(get_params) or {} + new_get_params['page'] = page_no return "%s?%s" % ( base_url, urllib.urlencode(new_get_params)) |