Add an AdminController base class for Admin controllers

Handles stuff that's shared across admin controllers.

app/controllers/admin/dashboard_controller.rb

@@ -1,8 +1,4 @@
-class Admin::DashboardController < ApplicationController
+class Admin::DashboardController < AdminController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
   def index
     @workers = Resque.workers
     @pending_jobs = Resque.size(:post_receive)

app/controllers/admin/hooks_controller.rb

@@ -1,8 +1,4 @@
-class Admin::HooksController < ApplicationController
+class Admin::HooksController < AdminController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-  
   def index
     @hooks = SystemHook.all
     @hook = SystemHook.new
@@ -15,7 +11,7 @@ class Admin::HooksController < ApplicationController
       redirect_to admin_hooks_path, notice: 'Hook was successfully created.'
     else
       @hooks = SystemHook.all
-      render :index 
+      render :index
     end
   end
 

app/controllers/admin/logs_controller.rb

@@ -1,6 +1,2 @@
-class Admin::LogsController < ApplicationController
+class Admin::LogsController < AdminController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
 end
-

app/controllers/admin/projects_controller.rb

@@ -1,7 +1,4 @@
-class Admin::ProjectsController < ApplicationController
+class Admin::ProjectsController < AdminController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
   before_filter :admin_project, only: [:edit, :show, :update, :destroy, :team_update]
 
   def index
@@ -43,7 +40,7 @@ class Admin::ProjectsController < ApplicationController
   def update
     owner_id = params[:project].delete(:owner_id)
 
-    if owner_id 
+    if owner_id
       @admin_project.owner = User.find(owner_id)
     end
 
@@ -60,7 +57,7 @@ class Admin::ProjectsController < ApplicationController
     redirect_to admin_projects_url, notice: 'Project was successfully deleted.'
   end
 
-  private 
+  private
 
   def admin_project
     @admin_project = Project.find_by_code(params[:id])

app/controllers/admin/resque_controller.rb

@@ -1,5 +1,4 @@
-class Admin::ResqueController < ApplicationController
+class Admin::ResqueController < AdminController
-  layout 'admin'
   def show
   end
-end
+end

app/controllers/admin/team_members_controller.rb

@@ -1,8 +1,4 @@
-class Admin::TeamMembersController < ApplicationController
+class Admin::TeamMembersController < AdminController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
   def edit
     @admin_team_member = UsersProject.find(params[:id])
   end

app/controllers/admin/users_controller.rb

@@ -1,8 +1,4 @@
-class Admin::UsersController < ApplicationController
+class Admin::UsersController < AdminController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
   def index
     @admin_users = User.scoped
     @admin_users = @admin_users.filter(params[:filter])
@@ -24,7 +20,7 @@ class Admin::UsersController < ApplicationController
     @admin_user = User.find(params[:id])
 
     UsersProject.user_bulk_import(
-      @admin_user, 
+      @admin_user,
       params[:project_ids],
       params[:project_access]
     )
@@ -41,22 +37,22 @@ class Admin::UsersController < ApplicationController
     @admin_user = User.find(params[:id])
   end
 
-  def block 
+  def block
     @admin_user = User.find(params[:id])
 
     if @admin_user.block
       redirect_to :back, alert: "Successfully blocked"
-    else 
+    else
       redirect_to :back, alert: "Error occured. User was not blocked"
     end
   end
 
-  def unblock 
+  def unblock
     @admin_user = User.find(params[:id])
 
     if @admin_user.update_attribute(:blocked, false)
       redirect_to :back, alert: "Successfully unblocked"
-    else 
+    else
       redirect_to :back, alert: "Error occured. User was not unblocked"
     end
   end

app/controllers/admin_controller.rb

@@ -0,0 +1,11 @@
+# Provides a base class for Admin controllers to subclass
+#
+# Automatically sets the layout and ensures an administrator is logged in
+class AdminController < ApplicationController
+  layout 'admin'
+  before_filter :authenticate_admin!
+
+  def authenticate_admin!
+    return render_404 unless current_user.is_admin?
+  end
+end

app/controllers/application_controller.rb

@@ -84,10 +84,6 @@ class ApplicationController < ActionController::Base
     abilities << Ability
   end
 
-  def authenticate_admin!
-    return render_404 unless current_user.is_admin?
-  end
-
   def authorize_project!(action)
     return access_denied! unless can?(current_user, action, project)
   end