Refs #4246 Fix combinaitions to only consider effective days for the two tt

1 files changed, 3 insertions, 3 deletions

diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 97d2e7556..3f56f6a1d 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -487,7 +487,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   def merge!(another_tt)
     transaction do
       days = [].tap do |array|
-        array.push(*self.included_days_in_dates_and_periods, *another_tt.effective_days)
+        array.push(*self.effective_days, *another_tt.effective_days)
         array.uniq!
       end
 
@@ -516,7 +516,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   def intersect!(another_tt)
     transaction do
       days = [].tap do |array|
-        array.push(*self.included_days_in_dates_and_periods)
+        array.push(*self.effective_days)
         array.delete_if {|day| !another_tt.effective_days.include?(day) }
         array.uniq!
       end
@@ -536,7 +536,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   def disjoin!(another_tt)
     transaction do
       days = [].tap do |array|
-        array.push(*self.included_days_in_dates_and_periods)
+        array.push(*self.effective_days)
         array.delete_if {|day| another_tt.effective_days.include?(day) }
         array.uniq!
       end