Add an AdminController base class for Admin controllers

Handles stuff that's shared across admin controllers.

Add an AdminController base class for Admin controllers
Handles stuff that's shared across admin controllers.
Robert Speicher
1 parent 83f24de3
Showing 9 changed files with 27 additions and 44 deletions Show diff stats
app/controllers/admin/dashboard_controller.rb
app/controllers/admin/hooks_controller.rb
app/controllers/admin/logs_controller.rb
app/controllers/admin/projects_controller.rb
app/controllers/admin/resque_controller.rb
app/controllers/admin/team_members_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/admin_controller.rb
app/controllers/application_controller.rb
-class Admin::DashboardController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
+class Admin::DashboardController < AdminController
   def index
     @workers = Resque.workers
     @pending_jobs = Resque.size(:post_receive)
-class Admin::HooksController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-  
+class Admin::HooksController < AdminController
   def index
     @hooks = SystemHook.all
     @hook = SystemHook.new
@@ -15,7 +11,7 @@ class Admin::HooksController &lt; ApplicationController
       redirect_to admin_hooks_path, notice: 'Hook was successfully created.'
     else
       @hooks = SystemHook.all
-      render :index 
+      render :index
     end
   end
-class Admin::LogsController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
+class Admin::LogsController < AdminController
 end
-
-class Admin::ProjectsController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
+class Admin::ProjectsController < AdminController
   before_filter :admin_project, only: [:edit, :show, :update, :destroy, :team_update]
   def index
@@ -43,7 +40,7 @@ class Admin::ProjectsController &lt; 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 &lt; 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])
-class Admin::ResqueController < ApplicationController
-  layout 'admin'
+class Admin::ResqueController < AdminController
   def show
   end
-end
 \ No newline at end of file
+end
-class Admin::TeamMembersController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
+class Admin::TeamMembersController < AdminController
   def edit
     @admin_team_member = UsersProject.find(params[:id])
   end
-class Admin::UsersController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
+class Admin::UsersController < AdminController
   def index
     @admin_users = User.scoped
     @admin_users = @admin_users.filter(params[:filter])
@@ -24,7 +20,7 @@ class Admin::UsersController &lt; 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 &lt; 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
@@ -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
@@ -84,10 +84,6 @@ class ApplicationController &lt; 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
1	-class Admin::LogsController < ApplicationController
2	- layout "admin"
3	- before_filter :authenticate_user!
4	- before_filter :authenticate_admin!	1	+class Admin::LogsController < AdminController
5	end	2	end
6	-
1	-class Admin::ResqueController < ApplicationController
2	- layout 'admin'	1	+class Admin::ResqueController < AdminController
3	def show	2	def show
4	end	3	end
5	-end
6	\ No newline at end of file	4	\ No newline at end of file
		5	+end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+# Provides a base class for Admin controllers to subclass
	2	+#
	3	+# Automatically sets the layout and ensures an administrator is logged in
	4	+class AdminController < ApplicationController
	5	+ layout 'admin'
	6	+ before_filter :authenticate_admin!
	7	+
	8	+ def authenticate_admin!
	9	+ return render_404 unless current_user.is_admin?
	10	+ end
	11	+end