aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorXinhui2017-06-05 11:46:32 +0200
committerRobert2017-06-05 17:24:59 +0200
commita992b6ca99c94e7c9703db430ddd00372ec2156a (patch)
tree42d604e85aa8f416fe66425e8eed6a32e6673a93 /app
parentc59f237817100f73baec56e04bfaf172d7d59fc1 (diff)
downloadchouette-core-a992b6ca99c94e7c9703db430ddd00372ec2156a.tar.bz2
Fix time_table combination disjoin & intersects should not clear int_day_type
Diffstat (limited to 'app')
-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}