Always give full stack trace for admin interface

6 files changed, 19 insertions, 81 deletions

diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb
index e9db1d52e..3382c92fa 100644
--- a/app/controllers/admin_censor_rule_controller.rb
+++ b/app/controllers/admin_censor_rule_controller.rb
@@ -4,12 +4,9 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_censor_rule_controller.rb,v 1.4 2008-11-04 15:07:49 francis Exp $
-
-class AdminCensorRuleController < ApplicationController
-    layout "admin"
-    before_filter :assign_http_auth_user
+# $Id: admin_censor_rule_controller.rb,v 1.5 2009-01-29 12:10:10 francis Exp $
 
+class AdminCensorRuleController < AdminController
     def new
         @info_request = InfoRequest.find(params[:info_request_id])
     end
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index aa3341e8e..9f7be2ac0 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -1,65 +1,18 @@
-# app/controllers/admin_controller.rb:
-# Controller for admin interface.
+# controllers/admin.rb:
+# All admin controllers are dervied from this.
 #
-# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
+# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_controller.rb,v 1.22 2008-11-17 16:08:22 francis Exp $
+# $Id: admin_controller.rb,v 1.23 2009-01-29 12:10:10 francis Exp $
 
-class AdminController < ApplicationController
+
+class AdminController < ActionController::Base
     layout "admin"
     before_filter :assign_http_auth_user
 
-    def index
-        # Overview counts of things
-        @user_count = User.count
-        @public_body_count = PublicBody.count
-        @info_request_count = InfoRequest.count
-        @track_thing_count = TrackThing.count
-        @comment_count = Comment.count
-
-        # Tasks to do
-        @requires_admin_requests = InfoRequest.find(:all, :select => '*, ' + InfoRequest.last_event_time_clause + ' as last_event_time', :conditions => ["described_state = 'requires_admin'"], :order => "last_event_time")
-        @blank_contacts = PublicBody.find(:all, :conditions => ["request_email = ''"], :order => "updated_at")
-        @ten_days_old_unclassified = InfoRequest.find(:all, :select => '*, ' + InfoRequest.last_event_time_clause + ' as last_event_time', :conditions => [ "awaiting_description = ? and " + InfoRequest.last_event_time_clause + " < ? and prominence != 'backpage'", true, Time.now() - 10.days ], :order => "last_event_time")
-        @holding_pen_messages = InfoRequest.holding_pen_request.incoming_messages
-    end
-
-    def timeline
-        # Recent events
-        @events_title = "Events in last two days"
-        date_back_to = Time.now - 2.days
-        if params[:week]
-            @events_title = "Events in last week"
-            date_back_to = Time.now - 1.week
-        end
-        if params[:month]
-            @events_title = "Events in last month"
-            date_back_to = Time.now - 1.month
-        end
-        if params[:all]
-            @events_title = "Events, all time"
-            date_back_to = Time.now - 1000.years
-        end
-        @events = InfoRequestEvent.find(:all, :order => "created_at desc, id desc",
-                :conditions => ["created_at > ? ", date_back_to])
-        @public_body_history = PublicBody.versioned_class.find(:all, :order => "updated_at desc, id desc",
-                :conditions => ["updated_at > ? ", date_back_to])
-        for pbh in @public_body_history
-            pbh.created_at = pbh.updated_at
-        end
-        @events += @public_body_history
-
-        @events.sort! { |a,b| b.created_at <=> a.created_at }
-    end
-
-    def stats
-        @request_by_state = InfoRequest.count(:group => 'described_state')
-        @tracks_by_type = TrackThing.count(:group => 'track_type')
-    end
-
-    def debug
-        @request_env = request.env 
+    # Always give full stack trace for admin interface
+    def local_request?
+        true
     end
 end
-
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index 36a310a8a..0e5a8b213 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -4,12 +4,9 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_public_body_controller.rb,v 1.18 2008-08-14 08:09:39 francis Exp $
-
-class AdminPublicBodyController < ApplicationController
-    layout "admin"
-    before_filter :assign_http_auth_user
+# $Id: admin_public_body_controller.rb,v 1.19 2009-01-29 12:10:10 francis Exp $
 
+class AdminPublicBodyController < AdminController
     def index
         list
         render :action => 'list'
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index c86972eb3..6bba0bc88 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -4,12 +4,9 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_request_controller.rb,v 1.28 2008-12-18 18:55:22 francis Exp $
-
-class AdminRequestController < ApplicationController
-    layout "admin"
-    before_filter :assign_http_auth_user
+# $Id: admin_request_controller.rb,v 1.29 2009-01-29 12:10:10 francis Exp $
 
+class AdminRequestController < AdminController
     def index
         list
         render :action => 'list'
diff --git a/app/controllers/admin_track_controller.rb b/app/controllers/admin_track_controller.rb
index 97655cd9a..7142dc18e 100644
--- a/app/controllers/admin_track_controller.rb
+++ b/app/controllers/admin_track_controller.rb
@@ -4,12 +4,9 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_track_controller.rb,v 1.4 2008-07-28 18:04:38 francis Exp $
-
-class AdminTrackController < ApplicationController
-    layout "admin"
-    before_filter :assign_http_auth_user
+# $Id: admin_track_controller.rb,v 1.5 2009-01-29 12:10:10 francis Exp $
 
+class AdminTrackController < AdminController
     def list
         @query = params[:query]
         @admin_tracks = TrackThing.paginate :order => "created_at desc", :page => params[:page], :per_page => 100,
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb
index 135bf0276..49667017e 100644
--- a/app/controllers/admin_user_controller.rb
+++ b/app/controllers/admin_user_controller.rb
@@ -4,12 +4,9 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_user_controller.rb,v 1.8 2009-01-29 11:18:01 francis Exp $
-
-class AdminUserController < ApplicationController
-    layout "admin"
-    before_filter :assign_http_auth_user
+# $Id: admin_user_controller.rb,v 1.9 2009-01-29 12:10:10 francis Exp $
 
+class AdminUserController < AdminController
     def index
         list
         render :action => 'list'