diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb index c037e3ab..27e1754f 100644 --- a/app/controllers/schedules_controller.rb +++ b/app/controllers/schedules_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class SchedulesController < ApplicationController + include ConferenceHelper + load_and_authorize_resource before_action :respond_to_options load_resource :conference, find_by: :short_title @@ -67,10 +69,7 @@ class SchedulesController < ApplicationController end def happening_now - @events_schedules = @program.selected_event_schedules( - includes: [:room, { event: %i[track event_type speakers submitter] }] - ).select(&:happening_now?) - @events_schedules = [] unless @events_schedules + @events_schedules = get_happening_now_events_schedules_schedules(@conference) @current_time = Time.now.in_time_zone(@conference.timezone) respond_to do |format| diff --git a/app/helpers/conference_helper.rb b/app/helpers/conference_helper.rb index 417a8d55..fa5e66c3 100644 --- a/app/helpers/conference_helper.rb +++ b/app/helpers/conference_helper.rb @@ -77,4 +77,12 @@ module ConferenceHelper end calendar end + + def get_happening_now_events_schedules_schedules(conference) + events_schedules = conference.program.selected_event_schedules( + includes: [:room, { event: %i[track event_type speakers submitter] }] + ).select(&:happening_now?) + events_schedules = [] unless events_schedules + events_schedules + end end