From f13808623671668a7f5e1fda2f2f2106d9699966 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 19 Feb 2013 13:02:48 +1100 Subject: Merge in adminbootstraptheme 323d704ab4f1ffe31f20fcabeaf030c462dfbadf into main project --- app/controllers/admin_general_controller.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'app/controllers/admin_general_controller.rb') diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index 9f4c398c1..81c34a3b3 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -115,6 +115,17 @@ class AdminGeneralController < AdminController end def stats + # Overview counts of things + @public_body_count = PublicBody.count + + @info_request_count = InfoRequest.count + @outgoing_message_count = OutgoingMessage.count + @incoming_message_count = IncomingMessage.count + + @user_count = User.count + @track_thing_count = TrackThing.count + + @comment_count = Comment.count @request_by_state = InfoRequest.count(:group => 'described_state') @tracks_by_type = TrackThing.count(:group => 'track_type') end -- cgit v1.2.3 From 8085e924a8888138a0c9127806888c438cf2600d Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 19 Feb 2013 14:27:47 +1100 Subject: Move serving of js for admin interface from general to admin_general controller --- app/controllers/admin_general_controller.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/controllers/admin_general_controller.rb') diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index 81c34a3b3..800678787 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -5,6 +5,8 @@ # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ class AdminGeneralController < AdminController + skip_before_filter :authenticate, :only => :admin_js + def index # ensure we have a trailing slash current_uri = request.env['REQUEST_URI'] @@ -139,5 +141,10 @@ class AdminGeneralController < AdminController @github_origin = "https://github.com/#{repo}/tree/" @request_env = request.env end + + # TODO: Remove this when support for proxy admin interface is removed + def admin_js + render :layout => false, :content_type => "application/javascript" + end end -- cgit v1.2.3