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

All events moved to a different controller method

Browse source 
All events moved to a different controller method and css changed to put together things with the same css attributes.
This commit is contained in:
Ana 2016-06-30 16:53:15 +02:00
parent 24364d0136
commit 6d9eabcc0e
9 changed files with 149 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/conference_controller.rb
View file

@ -13,6 +13,10 @@ class ConferenceController < ApplicationController
def schedule
@rooms = @conference.venue.rooms if @conference.venue
unless @conference.program.events.scheduled.any?
redirect_to events_conference_path(@conference.short_title)
end
@events = @conference.program.events
@events_xml = @events.scheduled.order(start_time: :asc).group_by{ |event| event.start_time.to_date }
@dates = @conference.start_date..@conference.end_date
@ -20,15 +24,13 @@ class ConferenceController < ApplicationController
@conf_start = 9
conf_end = 20
@conf_period = conf_end - @conf_start
end
def events
@dates = @conference.start_date..@conference.end_date
@scheduled_events = @conference.program.events.scheduled
@unscheduled_events = @conference.program.events.unscheduled
if @dates == Date.current
@today = Date.current.strftime('%Y-%m-%d')
else
@today = @conference.start_date.strftime('%Y-%m-%d')
end
end
private