aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/chouette/time_table.rb
diff options
context:
space:
mode:
authorXinhui2017-06-05 11:46:32 +0200
committerXinhui2017-06-05 11:57:53 +0200
commit560b21733c676187d02795332e8ec0491cd875b8 (patch)
treedebe1a5dd9303dee1da72e65a80006253416d7b6 /app/models/chouette/time_table.rb
parent6ae4dc1f2d05f4499245e77680e69a0678c17bc7 (diff)
downloadchouette-core-560b21733c676187d02795332e8ec0491cd875b8.tar.bz2
Fix time_table combination disjoin & intersects should not clear int_day_type
Diffstat (limited to 'app/models/chouette/time_table.rb')
-rw-r--r--app/models/chouette/time_table.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 85f1e8c6e..2d329bcc6 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -478,8 +478,6 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
if !another_tt.periods.empty?
# copy periods
self.periods = another_tt.clone_periods
- # set valid_days
- self.int_day_types = another_tt.int_day_types
end
# merge dates
self.dates ||= []
@@ -543,7 +541,6 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
self.dates.clear
days.each {|d| self.dates << Chouette::TimeTableDate.new( :date =>d, :in_out => true)}
self.periods.clear
- self.int_day_types = 0
self.dates.to_a.sort! { |a,b| a.date <=> b.date}
self.save!
end
@@ -558,8 +555,6 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
days = self.effective_days - days_to_exclude
self.dates.clear
self.periods.clear
- self.int_day_types = 0
-
days.each {|d| self.dates << Chouette::TimeTableDate.new( :date =>d, :in_out => true)}
self.dates.to_a.sort! { |a,b| a.date <=> b.date}