conflict resolved

5 files changed, 12 insertions, 2 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
index 9dea63e07..c7e8d58e7 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -42,7 +42,9 @@ const vehicleJourney= (state = {}, action, keep) => {
         time_tables: [],
         vehicle_journey_at_stops: pristineVjasList,
         selected: false,
-        deletable: false
+        deletable: false,
+        transport_mode: window.transportMode ? window.transportMode : 'undefined',
+        transport_submode: window.transportSubmode ? window.transportSubmode : 'undefined'
       }
     case 'DUPLICATE_VEHICLEJOURNEY':
     case 'SHIFT_VEHICLEJOURNEY':
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index d31d7b27e..6d40d495b 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -64,6 +64,9 @@ class VehicleJourneysController < ChouetteController
       }
     end
 
+    @transport_mode = route.line['transport_mode']
+    @transport_submode = route.line['transport_submode']
+
     if params[:jp]
       @jp_origin  = Chouette::JourneyPattern.find_by(objectid: params[:jp])
       @jp_origin_stop_points = @jp_origin.stop_points
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
index c300a20f3..93f4e3221 100644
--- a/app/views/vehicle_journeys/index.html.slim
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -17,6 +17,8 @@
   | window.stopPoints = #{(@stop_points_list.to_json).html_safe};
   | window.jpOrigin = #{(@jp_origin.to_json).html_safe};
   | window.jpOriginStopPoints = #{(@jp_origin_stop_points.to_json).html_safe};
+  | window.transportMode = #{(@transport_mode.to_json).html_safe};
+  | window.transportSubmode = #{(@transport_submode.to_json).html_safe};
   | window.vehicleJourneysLength = #{@vehicle_journeys.total_entries()};
   | window.vehicleJourneysPerPage = #{@ppage};
   | window.line_footnotes = #{raw @footnotes};
diff --git a/spec/features/routes_spec.rb b/spec/features/routes_spec.rb
index 7be506b57..28015f011 100644
--- a/spec/features/routes_spec.rb
+++ b/spec/features/routes_spec.rb
@@ -37,6 +37,7 @@ describe "Routes", :type => :feature do
       click_link "Ajouter un itinéraire"
       fill_in "route_name", :with => "A to B"
       fill_in "route_published_name", :with => "Published A to B"
+      # select 'Aller', :from => "route_direction"
       check('route[wayback]')
       click_button("Valider")
       expect(page).to have_content("A to B")
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
index 662c3d82f..23ebc3d9f 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -111,7 +111,9 @@ describe('vehicleJourneys reducer', () => {
       time_tables: [],
       vehicle_journey_at_stops: pristineVjasList,
       selected: false,
-      deletable: false
+      deletable: false,
+      transport_mode: 'undefined',
+      transport_submode: 'undefined'
     }, ...state])
   })