Vehicle journeys clear time_tableas association when remove from state

Refs #3121

1 files changed, 6 insertions, 4 deletions

diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 27830490f..913fdcd73 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -92,10 +92,12 @@ module Chouette
     end
 
     def update_time_tables_from_state item
-      item['time_tables'].each do |tt|
-        unless self.time_tables.map(&:id).include?(tt['id'])
-          self.time_tables << Chouette::TimeTable.find(tt['id'])
-        end
+      state_tt_ids = item['time_tables'].map{|tt| tt['id']}
+      self.time_tables.map(&:id).each do |id|
+        self.time_tables.delete(self.time_tables.find(id)) unless state_tt_ids.include?(id)
+      end
+      state_tt_ids.each do |id|
+        self.time_tables << Chouette::TimeTable.find(id) unless self.time_tables.map(&:id).include?(id)
       end
     end