diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/chouette/time_table.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb index 151570f20..4186af6d2 100644 --- a/app/models/chouette/time_table.rb +++ b/app/models/chouette/time_table.rb @@ -477,17 +477,18 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord # merge effective days from another timetable def merge!(another_tt) transaction do + # merge dates + self.dates ||= [] + another_tt.included_days.each do |d| + add_included_day d + end + # if one tt has no period, just merge lists if self.periods.empty? || another_tt.periods.empty? if !another_tt.periods.empty? # copy periods self.periods = another_tt.clone_periods end - # merge dates - self.dates ||= [] - another_tt.included_days.each do |d| - add_included_day d - end else # check if periods can be kept common_day_types = self.int_day_types & another_tt.int_day_types & 508 |