adds routing.py and view.py changes
This commit is contained in:
parent
d49cf0e29c
commit
184f2240cb
@ -19,6 +19,8 @@ from routes.route import Route
|
|||||||
user_routes = [
|
user_routes = [
|
||||||
Route('mediagoblin.user_pages.user_home', "/{user}/",
|
Route('mediagoblin.user_pages.user_home', "/{user}/",
|
||||||
controller="mediagoblin.user_pages.views:user_home"),
|
controller="mediagoblin.user_pages.views:user_home"),
|
||||||
|
Route('mediagoblin.user_pages.user_gallery', "/{user}/gallery/",
|
||||||
|
controller="mediagoblin.user_pages.views:user_gallery"),
|
||||||
Route('mediagoblin.user_pages.media_home', '/{user}/m/{media}/',
|
Route('mediagoblin.user_pages.media_home', '/{user}/m/{media}/',
|
||||||
requirements=dict(m_id="[0-9a-fA-F]{24}"),
|
requirements=dict(m_id="[0-9a-fA-F]{24}"),
|
||||||
controller="mediagoblin.user_pages.views:media_home"),
|
controller="mediagoblin.user_pages.views:media_home"),
|
||||||
|
@ -49,6 +49,36 @@ def user_home(request, page):
|
|||||||
'media_entries': media_entries,
|
'media_entries': media_entries,
|
||||||
'pagination': pagination})
|
'pagination': pagination})
|
||||||
|
|
||||||
|
@uses_pagination
|
||||||
|
def user_gallery(request, page):
|
||||||
|
"""'Gallery' of a User()"""
|
||||||
|
user = request.db.User.find_one({
|
||||||
|
'username': request.matchdict['user'],
|
||||||
|
'status': 'active'})
|
||||||
|
if not user:
|
||||||
|
return exc.HTTPNotFound()
|
||||||
|
|
||||||
|
cursor = request.db.MediaEntry.find(
|
||||||
|
{'uploader': user['_id'],
|
||||||
|
'state': 'processed'}).sort('created', DESCENDING)
|
||||||
|
|
||||||
|
pagination = Pagination(page, cursor)
|
||||||
|
media_entries = pagination()
|
||||||
|
|
||||||
|
#if no data is available, return NotFound
|
||||||
|
if media_entries == None:
|
||||||
|
return exc.HTTPNotFound()
|
||||||
|
|
||||||
|
template = request.template_env.get_template(
|
||||||
|
'mediagoblin/user_pages/gallery.html')
|
||||||
|
|
||||||
|
return Response(
|
||||||
|
template.render(
|
||||||
|
{'request': request,
|
||||||
|
'user': user,
|
||||||
|
'media_entries': media_entries,
|
||||||
|
'pagination': pagination}))
|
||||||
|
|
||||||
|
|
||||||
@get_user_media_entry
|
@get_user_media_entry
|
||||||
def media_home(request, media):
|
def media_home(request, media):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user