refactor: Changes admin to director

Author: cbaudouinjr

app/assets/javascripts/manage/lib/setupDataTables.js

@@ -36,7 +36,7 @@ var setupDataTables = function () {
     ],
   });
 
-  $('.datatable.admins').DataTable({
+  $('.datatable.staff').DataTable({
     order: [2, 'asc'],
     columns: [
       { orderable: true, data: 'id', visible: false },

app/controllers/manage/application_controller.rb

@@ -1,27 +1,27 @@
 class Manage::ApplicationController < ApplicationController
   before_action :logged_in
-  before_action :require_admin_or_limited_admin
-  before_action :limit_write_access_to_admins, only: ["edit", "update", "new", "create", "destroy", "convert_to_admin", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email", "live_preview"]
+  before_action :require_director_or_limited_admin
+  before_action :limit_write_access_to_directors, only: ["edit", "update", "new", "create", "destroy", "convert_to_admin", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email", "live_preview"]
   skip_before_action :verify_authenticity_token, if: :json_request?
 
   def logged_in
     authenticate_user!
   end
 
-  def require_full_admin
-    return redirect_to root_path unless current_user.try(:admin?)
+  def require_director
+    return redirect_to root_path unless current_user.try(:director?)
   end
 
-  def require_admin_or_limited_admin
-    return redirect_to root_path unless current_user.try(:admin?) || current_user.try(:admin_limited_access?)
+  def require_director_or_limited_admin
+    return redirect_to root_path unless current_user.try(:director?) || current_user.try(:admin_limited_access?)
   end
 
-  def require_admin_or_limited_admin_or_event_tracking
-    redirect_to root_path unless current_user.try(:admin?) || current_user.try(:admin_limited_access?) || current_user.try(:event_tracking?)
+  def require_director_or_limited_admin_or_event_tracking
+    redirect_to root_path unless current_user.try(:director?) || current_user.try(:admin_limited_access?) || current_user.try(:event_tracking?)
   end
 
-  def limit_write_access_to_admins
-    redirect_to url_for(controller: controller_name, action: :index) unless current_user.try(:admin?)
+  def limit_write_access_to_directors
+    redirect_to url_for(controller: controller_name, action: :index) unless current_user.try(:director?)
   end
 
   def json_request?

app/controllers/manage/configs_controller.rb

@@ -1,5 +1,5 @@
 class Manage::ConfigsController < Manage::ApplicationController
-  before_action :limit_access_admin
+  before_action :require_director
   before_action :get_config, only: [:edit, :update, :update_only_css_variables]
 
   respond_to :html, :json
@@ -69,7 +69,4 @@ def get_config
     end
   end
 
-  def limit_access_admin
-    redirect_to root_path unless current_user.admin?
-  end
 end

app/controllers/manage/dashboard_controller.rb

@@ -1,6 +1,5 @@
 class Manage::DashboardController < Manage::ApplicationController
-  skip_before_action :require_admin_or_limited_admin
-  before_action :require_admin_or_limited_admin
+  before_action :require_director_or_limited_admin
 
   def index
   end

app/controllers/manage/data_exports_controller.rb

@@ -1,6 +1,6 @@
 class Manage::DataExportsController < Manage::ApplicationController
-  skip_before_action :require_admin_or_limited_admin
-  before_action :require_full_admin
+  skip_before_action :require_director_or_limited_admin
+  before_action :require_director
 
   before_action :set_data_export, only: [:destroy]
 

app/controllers/manage/messages_controller.rb

@@ -1,7 +1,7 @@
 class Manage::MessagesController < Manage::ApplicationController
   before_action :set_message, only: [:show, :edit, :update, :destroy, :deliver, :preview, :duplicate]
   before_action :check_message_access, only: [:edit, :update, :destroy]
-  before_action :limit_template_access_to_admins, only: [:template, :template_preview, :template_update, :template_replace_with_default]
+  before_action :limit_template_access_to_directors, only: [:template, :template_preview, :template_update, :template_replace_with_default]
 
   respond_to :html, :json
 
@@ -106,9 +106,9 @@ def template_replace_with_default
 
   private
 
-  def limit_template_access_to_admins
+  def limit_template_access_to_directors
     # From Manage::ApplicationController
-    limit_write_access_to_admins
+    limit_write_access_to_directors
   end
 
   def message_params

app/controllers/manage/questionnaires_controller.rb

@@ -1,7 +1,7 @@
 class Manage::QuestionnairesController < Manage::ApplicationController
   include QuestionnairesControllable
 
-  before_action :set_questionnaire, only: [:show, :edit, :update, :destroy, :check_in, :convert_to_admin, :update_acc_status]
+  before_action :set_questionnaire, only: [:show, :edit, :update, :destroy, :check_in, :convert_to_director, :update_acc_status]
 
   respond_to :html, :json
 
@@ -95,10 +95,10 @@ def check_in
     redirect_to index_redirect_path
   end
 
-  def convert_to_admin
+  def convert_to_director
     user = @questionnaire.user
     @questionnaire.destroy
-    user.update_attributes(role: :admin)
+    user.update_attributes(role: :director)
     redirect_to edit_manage_user_path(user)
   end
 

app/controllers/manage/trackable_events_controller.rb

@@ -1,6 +1,6 @@
 class Manage::TrackableEventsController < Manage::ApplicationController
-  skip_before_action :require_admin_or_limited_admin
-  before_action :require_admin_or_limited_admin_or_event_tracking
+  skip_before_action :require_director_or_limited_admin
+  before_action :require_director_or_limited_admin_or_event_tracking
 
   before_action :set_trackable_event, only: [:show, :edit, :update, :destroy]
   before_action :scope_limited_admin_access, only: [:edit, :update, :destroy]
@@ -81,13 +81,13 @@ def trackable_event_params
     params.require(:trackable_event).permit(:band_id, :trackable_tag_id)
   end
 
-  # Permit limited-access admins (overrides Manage::ApplicationController#limit_write_access_to_admins)
-  def limit_write_access_to_admins
+  # Permit limited-access directors (overrides Manage::ApplicationController#limit_write_access_to_directors)
+  def limit_write_access_to_directors
   end
 
-  # If the user isn't a full admin, scope changes only to those they created
+  # If the user isn't a director, scope changes only to those they created
   def scope_limited_admin_access
-    return if current_user.admin? || @trackable_event.blank? || @trackable_event.user.blank?
+    return if current_user.director? || @trackable_event.blank? || @trackable_event.user.blank?
     redirect_to manage_trackable_events_path, notice: 'You may not view events you did not create.' if @trackable_event.user != current_user
   end
 end

app/controllers/manage/trackable_tags_controller.rb

@@ -1,6 +1,6 @@
 class Manage::TrackableTagsController < Manage::ApplicationController
-  skip_before_action :require_admin_or_limited_admin
-  before_action :require_admin_or_limited_admin_or_event_tracking
+  skip_before_action :require_director_or_limited_admin
+  before_action :require_director_or_limited_admin_or_event_tracking
 
   before_action :set_trackable_tag, only: [:show, :edit, :update, :destroy]
 

app/controllers/manage/users_controller.rb

@@ -1,19 +1,19 @@
 class Manage::UsersController < Manage::ApplicationController
-  before_action :require_full_admin
+  before_action :require_director
   before_action :find_user, only: [:show, :edit, :update, :destroy]
 
   respond_to :html, :json
 
   def index
-    respond_with(:manage, User.where(role: [:admin, :admin_limited_access, :event_tracking]))
+    respond_with(:manage, User.where(role: [:director, :admin_limited_access, :event_tracking]))
   end
 
   def user_datatable
     render json: UserDatatable.new(params, view_context: view_context)
   end
 
-  def admin_datatable
-    render json: AdminDatatable.new(params, view_context: view_context)
+  def staff_datatable
+    render json: StaffDatatable.new(params, view_context: view_context)
   end
 
   def show