projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
[mediagoblin.git]
/
mediagoblin
/
views.py
diff --git
a/mediagoblin/views.py
b/mediagoblin/views.py
index e7d9dbdddfb1bc4cdab1782d4ae776778df04fa5..ecf5b7239b6d8109014647185033eefd2c5474af 100644
(file)
--- a/
mediagoblin/views.py
+++ b/
mediagoblin/views.py
@@
-1,5
+1,5
@@
# GNU MediaGoblin -- federated, autonomous media hosting
# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011
Free Software Foundation, Inc
+# Copyright (C) 2011
MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@
-15,17
+15,25
@@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin import mg_globals
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin import mg_globals
-from mediagoblin.util import render_to_response
+from mediagoblin.tools.pagination import Pagination
+from mediagoblin.tools.response import render_to_response
from mediagoblin.db.util import DESCENDING
from mediagoblin.db.util import DESCENDING
+from mediagoblin.decorators import uses_pagination
-def root_view(request):
- media_entries = request.db.MediaEntry.find(
+
+@uses_pagination
+def root_view(request, page):
+ cursor = request.db.MediaEntry.find(
{u'state': u'processed'}).sort('created', DESCENDING)
{u'state': u'processed'}).sort('created', DESCENDING)
-
+
+ pagination = Pagination(page, cursor)
+ media_entries = pagination()
+
return render_to_response(
request, 'mediagoblin/root.html',
{'media_entries': media_entries,
return render_to_response(
request, 'mediagoblin/root.html',
{'media_entries': media_entries,
- 'allow_registration': mg_globals.app_config["allow_registration"]})
+ 'allow_registration': mg_globals.app_config["allow_registration"],
+ 'pagination': pagination})
def simple_template_render(request):
def simple_template_render(request):