Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels
This commit is contained in:
parent
028b82fda8
commit
444356fbc7
117 changed files with 1812 additions and 905 deletions
|
|
@ -1,6 +1,7 @@
|
|||
class ConferenceController < ApplicationController
|
||||
before_filter :respond_to_options
|
||||
load_and_authorize_resource find_by: :short_title
|
||||
load_resource :program, through: :conference, singleton: true, except: :index
|
||||
|
||||
def index
|
||||
@current = Conference.where('end_date >= ?', Date.current).order('start_date ASC')
|
||||
|
|
@ -10,8 +11,8 @@ class ConferenceController < ApplicationController
|
|||
def show; end
|
||||
|
||||
def schedule
|
||||
@rooms = @conference.rooms
|
||||
@events = @conference.events
|
||||
@rooms = @conference.program.rooms
|
||||
@events = @conference.program.events
|
||||
@dates = @conference.start_date..@conference.end_date
|
||||
|
||||
if @dates == Date.current
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue