1 files changed, 14 insertions, 21 deletions
diff --git a/mediagoblin/admin/views.py b/mediagoblin/admin/views.py
index faa8603a..7a4dfbd4 100644
--- a/mediagoblin/admin/views.py
+++ b/mediagoblin/admin/views.py
@@ -17,18 +17,14 @@
 from werkzeug.exceptions import Forbidden
 
 from mediagoblin.db.models import MediaEntry, User, MediaComment, CommentReport, ReportBase
-from mediagoblin.decorators import require_active_login
+from mediagoblin.decorators import require_admin_login
 from mediagoblin.tools.response import render_to_response
 
-@require_active_login
+@require_admin_login
 def admin_processing_panel(request):
     '''
-    Show the global processing panel for this instance
+    Show the global media processing panel for this instance
     '''
-    # TODO: Why not a "require_admin_login" decorator throwing a 403 exception?
-    if not request.user.is_admin:
-        raise Forbidden()
-
     processing_entries = MediaEntry.query.filter_by(state = u'processing').\
         order_by(MediaEntry.created.desc())
 
@@ -47,15 +43,11 @@ def admin_processing_panel(request):
          'failed_entries': failed_entries,
          'processed_entries': processed_entries})
 
-@require_active_login
+@require_admin_login
 def admin_users_panel(request):
     '''
-    Show the global processing panel for this instance
+    Show the global panel for monitoring users in this instance
     '''
-    # TODO: Why not a "require_admin_login" decorator throwing a 403 exception?
-    if not request.user.is_admin:
-        raise Forbidden()
-
     user_list = User.query
 
     # Render to response
@@ -64,17 +56,18 @@ def admin_users_panel(request):
         'mediagoblin/admin/user.html',
         {'user_list': user_list})
 
-@require_active_login
+@require_admin_login
 def admin_reports_panel(request):
     '''
-    Show the global processing panel for this instance
+    Show the global panel for monitoring reports filed against comments or 
+        media entries for this instance.
     '''
-    # TODO: Why not a "require_admin_login" decorator throwing a 403 exception?
-    if not request.user.is_admin:
-        raise Forbidden()
-
-    report_list = ReportBase.query.filter(ReportBase.resolved==None).order_by(ReportBase.created.desc()).limit(10)
-    closed_report_list = ReportBase.query.filter(ReportBase.resolved!=None).order_by(ReportBase.created.desc()).limit(10)
+    report_list = ReportBase.query.filter(
+        ReportBase.resolved==None).order_by(
+        ReportBase.created.desc()).limit(10)
+    closed_report_list = ReportBase.query.filter(
+        ReportBase.resolved!=None).order_by(
+        ReportBase.created.desc()).limit(10)
 
     # Render to response
     return render_to_response(