diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index 123a269b..f4d08ac6 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -73,7 +73,8 @@ class ConferencesController < ApplicationController end if splashpage.include_happening_now @event_list = get_happening_now_events_schedules(@conference) - @pagy, @events_schedules = pagy_array(@event_list, items: 3) + @event_limit = 3 + @pagy, @events_schedules = pagy_array(@event_list, items: @event_limit) @happening_now_url = happening_now_conference_schedule_path(conference_id: @conference.short_title, format: :json) end end diff --git a/app/helpers/conference_helper.rb b/app/helpers/conference_helper.rb index ad9971a3..255cf2fa 100644 --- a/app/helpers/conference_helper.rb +++ b/app/helpers/conference_helper.rb @@ -82,7 +82,7 @@ module ConferenceHelper def get_happening_now_events_schedules(conference) events_schedules = conference.program.selected_event_schedules( includes: [:room, { event: %i[track event_type speakers submitter] }] - ).select(&:happening_now?) + )#.select(&:happening_now?) events_schedules ||= [] events_schedules end diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index 7c6dbab3..cf4ae80d 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -57,9 +57,8 @@ %h2.text-center{:style => "margin-bottom:30px"} Happening Now - for event_schedule in @events_schedules = render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event - - if @events_schedules.length > 3 - .container{:style => "margin:auto; width:50%"} - != pagy_nav(@pagy) + .container{:style => "margin:auto; width:50%"} + != pagy_nav(@pagy) - else .row %h3.text-center There are no events happening now.