diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f1cc7dcac..fb64bd1b7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base before_action :configure_permitted_parameters, if: :devise_controller? layout 'application' - decorates_assigned :event + private decorates_assigned :event private diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index eba368eb7..9b1621a83 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -6,7 +6,7 @@ class ProposalsController < ApplicationController before_action :require_invite_or_speaker, only: [:show] before_action :require_speaker, except: [ :index, :create, :new, :preview ] - decorates_assigned :proposal + private decorates_assigned :proposal def index proposals = current_user.proposals. diff --git a/app/controllers/schedule_controller.rb b/app/controllers/schedule_controller.rb index aa15c5534..970d32348 100644 --- a/app/controllers/schedule_controller.rb +++ b/app/controllers/schedule_controller.rb @@ -2,7 +2,7 @@ class ScheduleController < ApplicationController include WebsiteScheduleHelper after_action :set_cache_headers, only: :show - decorates_assigned :schedule, with: Staff::TimeSlotDecorator + private decorates_assigned :schedule, with: Staff::TimeSlotDecorator def show @schedule = current_website.time_slots.grid_order diff --git a/app/controllers/staff/program_sessions_controller.rb b/app/controllers/staff/program_sessions_controller.rb index fd90a0113..f71d503d0 100644 --- a/app/controllers/staff/program_sessions_controller.rb +++ b/app/controllers/staff/program_sessions_controller.rb @@ -3,9 +3,9 @@ class Staff::ProgramSessionsController < Staff::ApplicationController before_action :enable_staff_program_subnav - decorates_assigned :program_session, with: Staff::ProgramSessionDecorator - decorates_assigned :sessions, with: Staff::ProgramSessionDecorator - decorates_assigned :waitlisted_sessions, with: Staff::ProgramSessionDecorator + private decorates_assigned :program_session, with: Staff::ProgramSessionDecorator + private decorates_assigned :sessions, with: Staff::ProgramSessionDecorator + private decorates_assigned :waitlisted_sessions, with: Staff::ProgramSessionDecorator def index @sessions = current_event.program_sessions.includes(:speakers, :session_format, :track, :time_slot, :proposal) diff --git a/app/controllers/staff/proposal_reviews_controller.rb b/app/controllers/staff/proposal_reviews_controller.rb index a0c3b021b..f61e27926 100644 --- a/app/controllers/staff/proposal_reviews_controller.rb +++ b/app/controllers/staff/proposal_reviews_controller.rb @@ -3,7 +3,7 @@ class Staff::ProposalReviewsController < Staff::ApplicationController before_action :require_proposal, except: [:index] before_action :prevent_self_review, except: [:index] - decorates_assigned :proposal, with: Staff::ProposalDecorator + private decorates_assigned :proposal, with: Staff::ProposalDecorator respond_to :html def index diff --git a/app/controllers/staff/proposals_controller.rb b/app/controllers/staff/proposals_controller.rb index b653432ec..73e9c4fa3 100644 --- a/app/controllers/staff/proposals_controller.rb +++ b/app/controllers/staff/proposals_controller.rb @@ -6,7 +6,7 @@ class Staff::ProposalsController < Staff::ApplicationController skip_before_action :require_program_team, only: [:update] before_action :require_staff, only: [:update] - decorates_assigned :proposal, with: Staff::ProposalDecorator + private decorates_assigned :proposal, with: Staff::ProposalDecorator def index session[:prev_page] = {name: 'Proposals', path: event_staff_program_proposals_path} diff --git a/app/controllers/staff/ratings_controller.rb b/app/controllers/staff/ratings_controller.rb index c03d793c2..5dd39fe08 100644 --- a/app/controllers/staff/ratings_controller.rb +++ b/app/controllers/staff/ratings_controller.rb @@ -3,7 +3,7 @@ class Staff::RatingsController < Staff::ApplicationController before_action :require_proposal before_action :prevent_self_review - decorates_assigned :proposal + private decorates_assigned :proposal def create authorize @proposal, :rate? diff --git a/app/controllers/staff/time_slots_controller.rb b/app/controllers/staff/time_slots_controller.rb index aaa580ff4..ef7884d8a 100644 --- a/app/controllers/staff/time_slots_controller.rb +++ b/app/controllers/staff/time_slots_controller.rb @@ -5,7 +5,7 @@ class Staff::TimeSlotsController < Staff::ApplicationController helper_method :time_slot_decorated - decorates_assigned :time_slots, with: Staff::TimeSlotDecorator + private decorates_assigned :time_slots, with: Staff::TimeSlotDecorator def index @time_slots = current_event.time_slots.grid_order