Merge pull request #472 from af83/6527-fix-vjs-editor

6527 Fix VJs editor

2 files changed, 5 insertions, 2 deletions

diff --git a/app/controllers/vehicle_journeys_collections_controller.rb b/app/controllers/vehicle_journeys_collections_controller.rb
index 712bcc154..a117888ab 100644
--- a/app/controllers/vehicle_journeys_collections_controller.rb
+++ b/app/controllers/vehicle_journeys_collections_controller.rb
@@ -9,8 +9,8 @@ class VehicleJourneysCollectionsController < ChouetteController
   alias_method :route, :parent
 
   def update
-    state  = JSON.parse request.raw_post
-    Chouette::VehicleJourney.state_update route, state
+    state = JSON.parse request.raw_post
+    @resources = Chouette::VehicleJourney.state_update route, state
     errors = state.any? {|item| item['errors']}
 
     respond_to do |format|
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 54aad290c..c269d478e 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -244,11 +244,13 @@ module Chouette
     end
 
     def self.state_update route, state
+      objects = []
       transaction do
         state.each do |item|
           item.delete('errors')
           vj = find_by(objectid: item['objectid']) || state_create_instance(route, item)
           next if item['deletable'] && vj.persisted? && vj.destroy
+          objects << vj
 
           if vj.state_update_vjas?(item['vehicle_journey_at_stops'])
             vj.update_vjas_from_state(item['vehicle_journey_at_stops'])
@@ -276,6 +278,7 @@ module Chouette
         item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('new_record') }
       end
       state.delete_if {|item| item['deletable']}
+      objects
     end
 
     def self.state_create_instance route, item