Switch over media processor to use the get_workbench decorator (#565)

[mediagoblin.git] / mediagoblin / views.py

diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index cd6aba9b8fdc6a6608ee51ef63376193b96ffab8..6acd7e96f8aa8f56187a34eb7aa109f1a1d10c22 100644 (file)
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 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
@@ -14,21 +14,18 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
-
 from mediagoblin import mg_globals
+from mediagoblin.db.models import MediaEntry
 from mediagoblin.tools.pagination import Pagination
 from mediagoblin.tools.response import render_to_response
-from mediagoblin.db.util import DESCENDING
 from mediagoblin.decorators import uses_pagination
-from mediagoblin import media_types
 
 
 
 @uses_pagination
 def root_view(request, page):
-    cursor = request.db.MediaEntry.find(
-        {u'state': u'processed'}).sort('created', DESCENDING)
+    cursor = MediaEntry.query.filter_by(state=u'processed').\
+        order_by(MediaEntry.created.desc())
 
     pagination = Pagination(page, cursor)
     media_entries = pagination()
@@ -36,8 +33,7 @@ def root_view(request, page):
         request, 'mediagoblin/root.html',
         {'media_entries': media_entries,
          'allow_registration': mg_globals.app_config["allow_registration"],
-         'pagination': pagination,
-         'sys': sys})
+         'pagination': pagination})
 
 
 def simple_template_render(request):