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

Fix uninitialized constant selected_event error

Browse source
This commit is contained in:
Chaitanya 2017-04-25 21:58:13 +05:30
parent f38b755e62
commit f2af6188a1
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/schedules_controller.rb
View file

@ -3,15 +3,12 @@ class SchedulesController < ApplicationController
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
before_action :presence_of_selected_schedule
load_and_authorize_resource :selected_schedule, through: :program, singleton: true 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
schedules = @program.selected_event_schedules schedules = @program.selected_event_schedules
unless schedules
redirect_to events_conference_schedule_path(@conference.short_title)
end
@events_xml = schedules.map(&:event).group_by{ |event| event.time.to_date } if schedules @events_xml = schedules.map(&:event).group_by{ |event| event.time.to_date } if schedules
@dates = @conference.start_date..@conference.end_date @dates = @conference.start_date..@conference.end_date
@step_minutes = @program.schedule_interval.minutes @step_minutes = @program.schedule_interval.minutes
@ -49,4 +46,9 @@ class SchedulesController < ApplicationController
format.html { head :ok } format.html { head :ok }
end if request.options? end if request.options?
end end
def presence_of_selected_schedule
return if @program.selected_event_schedules
redirect_to root_path, notice: 'Program is yet to be scheduled.'
end
end end

2
app/views/conferences/_conference_details.html.haml
View file

@ -21,7 +21,7 @@
- if !@conference || @conference != conference - if !@conference || @conference != conference
- if conference.splashpage && conference.splashpage.public - if conference.splashpage && conference.splashpage.public
= link_to "View Conference", conference_path(conference.short_title), class: 'btn btn-default' = link_to "View Conference", conference_path(conference.short_title), class: 'btn btn-default'
- if conference.program and conference.program.schedule_public - if conference.program and conference.program.selected_event_schedules and conference.program.schedule_public
= link_to "Schedule", conference_schedule_path(conference.short_title), class: 'btn btn-default' = link_to "Schedule", conference_schedule_path(conference.short_title), class: 'btn btn-default'
- if conference.registration_open? - if conference.registration_open?
- if conference.user_registered?(current_user) - if conference.user_registered?(current_user)