From 3b96d9e63ea977dcb608d4f15828aa3495fbbe7b Mon Sep 17 00:00:00 2001 From: Jimmy Date: Wed, 7 Apr 2021 10:34:49 +0800 Subject: [PATCH] [feat] Display happening now events in splashpage --- app/controllers/conferences_controller.rb | 3 +++ app/views/conferences/show.html.haml | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index cf5fd04a..1827ad95 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class ConferencesController < ApplicationController + include ConferenceHelper + protect_from_forgery with: :null_session before_action :respond_to_options load_and_authorize_resource find_by: :short_title, except: :show @@ -70,6 +72,7 @@ class ConferencesController < ApplicationController @sponsors = @conference.sponsors end if splashpage.include_happening_now + @events_schedules = get_happening_now_events_schedules(@conference) @happening_now_url = happening_now_conference_schedule_path(conference_id: @conference.short_title, format: :json) end end diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index c5529cf0..96d10838 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -46,10 +46,15 @@ -# happening now events - if @conference.splashpage.include_happening_now - .row - .col-md-12 - #happening_now_panel - %h3.text-center There are no events happening now. + - if @events_schedules.any? + - for event_schedule in @events_schedules + .container + = render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event + - else + .row + .col-md-12 + #happening_now_panel + %h3.text-center There are no events happening now. -# calls for content, or program - if @conference.splashpage.include_cfp