aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorXinhui2017-03-15 11:56:54 +0100
committerXinhui2017-03-15 11:56:54 +0100
commitfa2fbe3f09b0330cb8b4e45a8f9b2c435c1a18b1 (patch)
treea7a024cd590b79a3df89af7711cf159ee4ada407 /app/models
parent509022838bffd4044f36773cedb8b3a59c464ddd (diff)
downloadchouette-core-fa2fbe3f09b0330cb8b4e45a8f9b2c435c1a18b1.tar.bz2
Wip delete vj from state
Refs #2777
Diffstat (limited to 'app/models')
-rw-r--r--app/models/chouette/vehicle_journey.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 23a5bdd56..3531a18e8 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -79,6 +79,8 @@ module Chouette
state.each do |item|
item.delete('errors')
vj = find_by(objectid: item['objectid'])
+ next if item['deletable'] && vj.persisted? && vj.destroy
+
vj.update_vehicle_journey_at_stops_state(item['vehicle_journey_at_stops'])
item['errors'] = vj.errors if vj.errors.any?
end
@@ -87,6 +89,9 @@ module Chouette
raise ActiveRecord::Rollback
end
end
+
+ # Cleanup
+ state.delete_if {|item| item['deletable']}
end
def increasing_times