From f2af6188a109285cd7184e88b89c1958463d87b8 Mon Sep 17 00:00:00 2001 From: Chaitanya Date: Tue, 25 Apr 2017 21:58:13 +0530 Subject: [PATCH] Fix uninitialized constant selected_event error --- app/controllers/schedules_controller.rb | 10 ++++++---- app/views/conferences/_conference_details.html.haml | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb index 96437520..d46cb219 100644 --- a/app/controllers/schedules_controller.rb +++ b/app/controllers/schedules_controller.rb @@ -3,15 +3,12 @@ class SchedulesController < ApplicationController before_action :respond_to_options load_resource :conference, find_by: :short_title 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 def show @rooms = @conference.venue.rooms if @conference.venue 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 @dates = @conference.start_date..@conference.end_date @step_minutes = @program.schedule_interval.minutes @@ -49,4 +46,9 @@ class SchedulesController < ApplicationController format.html { head :ok } end if request.options? 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 diff --git a/app/views/conferences/_conference_details.html.haml b/app/views/conferences/_conference_details.html.haml index bdbd5fc6..8e25850d 100644 --- a/app/views/conferences/_conference_details.html.haml +++ b/app/views/conferences/_conference_details.html.haml @@ -21,7 +21,7 @@ - if !@conference || @conference != conference - if conference.splashpage && conference.splashpage.public = 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' - if conference.registration_open? - if conference.user_registered?(current_user)