gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of the schedule controller

Browse source
This commit is contained in:
Henne Vogelsang 2014-11-27 14:31:44 +01:00
parent ebb7d8da2c
commit ce6ed0a8e9
10 changed files with 19 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/conference_controller.rb
View file

@ -11,6 +11,18 @@ class ConferenceController < ApplicationController
@keynote_speakers = @conference.keynote_speakers
end
def schedule
@rooms = @conference.rooms
@events = @conference.events
@dates = @conference.start_date..@conference.end_date
if @dates == Date.current
@today = Date.current.strftime('%Y-%m-%d')
else
@today = @conference.start_date.strftime('%Y-%m-%d')
end
end
def gallery_photos
@photos = @conference.photos
render 'photos', formats: [:js]

19
app/controllers/schedule_controller.rb
View file

@ -1,19 +0,0 @@
class ScheduleController < ApplicationController
authorize_resource class: false
layout 'application'
def index
@conference = Conference.
includes(:rooms, events: [:speakers, :track, :event_type]).
where(conferences: { short_title: params[:conference_id] }).first
@rooms = @conference.rooms
@events = @conference.events
@dates = @conference.start_date..@conference.end_date
if @dates == Date.current
@today = Date.current.strftime('%Y-%m-%d')
else
@today = @conference.start_date.strftime('%Y-%m-%d')
end
end
end