heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorganizing the uses_pagination decorator a little and having it pass

Browse Source 
in the page number to the view
This commit is contained in:
Christopher Allan Webber 2011-05-19 22:39:15 -05:00
parent af4d0b5cb0
commit 1301a8ad57
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/decorators.py
View File

@ -52,14 +52,12 @@ def uses_pagination(controller):
""" """
def wrapper(request, *args, **kwargs): def wrapper(request, *args, **kwargs):
try: try:
page = int(request.str_GET['page']) page = int(request.GET.get('page', 1))
if page < 0: if page < 0:
return exc.HTTPNotFound() return exc.HTTPNotFound()
except ValueError: except ValueError:
return exc.HTTPNotFound() return exc.HTTPNotFound()
except KeyError:
request.str_GET['page'] = 1
return controller(request, *args, **kwargs) return controller(request, page, *args, **kwargs)
return _make_safe(wrapper,controller) return _make_safe(wrapper,controller)

6
mediagoblin/user_pages/views.py
View File

@ -20,8 +20,9 @@ from mediagoblin.util import Pagination
from mediagoblin.decorators import uses_pagination from mediagoblin.decorators import uses_pagination
@uses_pagination @uses_pagination
def user_home(request): def user_home(request, page):
"""'Homepage' of a User()""" """'Homepage' of a User()"""
user = request.db.User.find_one({ user = request.db.User.find_one({
'username': request.matchdict['user'], 'username': request.matchdict['user'],
@ -33,8 +34,7 @@ def user_home(request):
.find({'uploader': user, 'state': 'processed'}) \ .find({'uploader': user, 'state': 'processed'}) \
.sort('created', DESCENDING) .sort('created', DESCENDING)
pagination = Pagination(page, cursor)
pagination = Pagination( int(request.str_GET['page']), cursor)
media_entries = pagination() media_entries = pagination()
#if no data is available, return NotFound #if no data is available, return NotFound