[feat] Use existing #happening_now method; respond to both html and json requests
This commit is contained in:
parent
7fe1c597ff
commit
6523eff5ab
5 changed files with 5 additions and 12 deletions
|
|
@ -112,11 +112,6 @@ class ConferencesController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
def live_events
|
||||
conference = Conference.find_by(short_title: params[:conference_id])
|
||||
render json: conference.find_live_events.to_json
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def conference_finder_conditions
|
||||
|
|
|
|||
|
|
@ -72,6 +72,11 @@ class SchedulesController < ApplicationController
|
|||
).select(&:happening_now?)
|
||||
@events_schedules = [] unless @events_schedules
|
||||
@current_time = Time.now.in_time_zone(@conference.timezone)
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json { render json: @events_schedules.to_json }
|
||||
end
|
||||
end
|
||||
|
||||
def app
|
||||
|
|
|
|||
|
|
@ -784,10 +784,6 @@ class Conference < ApplicationRecord
|
|||
end_date < Time.current
|
||||
end
|
||||
|
||||
def find_live_events
|
||||
program.events.select(&:happening_now?)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# Returns a different html colour for every i and consecutive colors are
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue