Merge remote branch 'remotes/hanaku/pagination'

[mediagoblin.git] / mediagoblin / user_pages / views.py

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 76f96cf913f40945afb6258e5a5a4ca6c83477de..d8665915a6bdb49796cc674d52e908584cb8d6e5 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -15,12 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from webob import Response, exc
-from pymongo import DESCENDING
-from mongokit import ObjectId
-import wtforms
+from mediagoblin.db.util import ObjectId, DESCENDING
 from mediagoblin.util import Pagination
-from pymongo import ASCENDING, DESCENDING
 
+from mediagoblin.decorators import uses_pagination
+
+@uses_pagination
 def user_home(request):
     """'Homepage' of a User()"""
     user = request.db.User.find_one({
@@ -32,13 +32,9 @@ def user_home(request):
     cursor = request.db.MediaEntry \
                 .find({'uploader': user, 'state': 'processed'}) \
                .sort('created', DESCENDING)
+    
 
-    try:
-        page = int(request.str_GET['page'])
-    except KeyError:
-        page = 1
-            
-    pagination = Pagination(cursor, page)
+    pagination = Pagination( int(request.str_GET['page']), cursor)
     media_entries = pagination()
 
     #if no data is available, return NotFound