gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge f4fdccd590 into 08e5f10559

Browse source
This commit is contained in:
Chaitanya Yadav 2017-06-06 15:44:47 +00:00 • committed by GitHub
commit a892d3327f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/schedules_controller.rb
View file

@ -1,9 +1,9 @@
class SchedulesController < ApplicationController class SchedulesController < ApplicationController
load_and_authorize_resource
protect_from_forgery with: :null_session protect_from_forgery with: :null_session
before_action :respond_to_options before_action :respond_to_options
load_resource :conference, find_by: :short_title load_resource :conference, find_by: :short_title
load_resource :program, through: :conference, singleton: true, except: :index load_resource :program, through: :conference, singleton: true, except: :index
load_and_authorize_resource :selected_schedule, through: :program, singleton: true
def show def show
@rooms = @conference.venue.rooms if @conference.venue @rooms = @conference.venue.rooms if @conference.venue