gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename intersecting_events to intersecting_event_schedules

Browse source
This commit is contained in:
shlok007 2017-02-12 19:10:03 +05:30
parent 0296a1e70d
commit a2b3396897
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/schedules/_carousel.html.haml
View file

@ -35,8 +35,8 @@
- span -= 1
- else
- event_schedule = event_schedules.find{ |e| e.start_time <= start_room_time and e.end_time > start_room_time }
- if event_schedule && (event_schedule.event.state == 'canceled' || event_schedule.event.state == 'withdrawn') && !event_schedule.intersecting_events.confirmed.empty?
- replacement_event = event_schedule.intersecting_events.confirmed.first
- if event_schedule && (event_schedule.event.state == 'canceled' || event_schedule.event.state == 'withdrawn') && !event_schedule.intersecting_event_schedules.confirmed.empty?
- replacement_event = event_schedule.intersecting_event_schedules.confirmed.first
- event_schedule = (replacement_event.start_time <= start_room_time && replacement_event.end_time > start_room_time) ? replacement_event : nil
- if event_schedule