Merge pull request #1253 from differentreality/1113

Rebases #1113
This commit is contained in:
Ana María Martínez Gómez 2017-01-31 10:08:38 +01:00 committed by GitHub
commit 4089f16f17
5 changed files with 31 additions and 19 deletions

View file

@ -31,6 +31,10 @@ class EventSchedule < ActiveRecord::Base
room.event_schedules.where(start_time: start_time, schedule: schedule).where.not(id: id)
end
def replacement?
event.state == 'confirmed' && (!intersecting_events.canceled.empty? || !intersecting_events.withdrawn.empty?)
end
private
def conference_id