aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-01-19 16:07:25 +0100
committerGitHub2018-01-19 16:07:25 +0100
commit6b0771ae11c1051f2e0ea3fd6211ffd85b158f7a (patch)
tree6982d7fa9fff2b81b816abeed7149fb4e2f4a48c
parent2d8c6a86a191671786f7021564caeb32c42bc7fd (diff)
parent2e96f2e7f13a1055d6a41c2abc419f126b9bdaf9 (diff)
downloadchouette-core-6b0771ae11c1051f2e0ea3fd6211ffd85b158f7a.tar.bz2
Merge pull request #239 from af83/5568-fix-vjs-editor
5568 Fix VJs editor when a stop has an invalid TZ
-rw-r--r--app/controllers/vehicle_journeys_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index d59696ad7..93ebd4472 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -60,10 +60,10 @@ class VehicleJourneysController < ChouetteController
:for_boarding => sp.try(:for_boarding),
:for_alighting => sp.try(:for_alighting),
:name => sp.stop_area.try(:name),
+ :time_zone_offset => sp.stop_area.try(:time_zone_offset),
:time_zone_formatted_offset => sp.stop_area.try(:time_zone_formatted_offset),
:zip_code => sp.stop_area.try(:zip_code),
:city_name => sp.stop_area.try(:city_name),
- :time_zone_offset => sp.stop_area.try(:time_zone_offset),
:comment => sp.stop_area.try(:comment),
:area_type => sp.stop_area.try(:area_type),
:stop_area_id => sp.stop_area_id,