Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/proposals_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/schedule_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/staff/program_sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/staff/proposal_reviews_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/staff/proposals_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/staff/ratings_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/staff/time_slots_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading