diff options
| author | Zog | 2018-01-12 11:04:16 +0100 |
|---|---|---|
| committer | Zog | 2018-01-12 11:06:15 +0100 |
| commit | 2e96f2e7f13a1055d6a41c2abc419f126b9bdaf9 (patch) | |
| tree | 46871e7409c8e8dc1264078261436ab99b1a9fde | |
| parent | 216821cbc5410a1377dd57b09ee2753aee13e37c (diff) | |
| download | chouette-core-2e96f2e7f13a1055d6a41c2abc419f126b9bdaf9.tar.bz2 | |
Refs #5568 @0.25h; Fix VJs editor when a stop has an invalid TZ5568-fix-vjs-editor
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/vehicle_journey_at_stop.rb | 1 |
2 files changed, 2 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, diff --git a/app/models/chouette/vehicle_journey_at_stop.rb b/app/models/chouette/vehicle_journey_at_stop.rb index f1a3cdcaa..7b9d92f68 100644 --- a/app/models/chouette/vehicle_journey_at_stop.rb +++ b/app/models/chouette/vehicle_journey_at_stop.rb @@ -103,6 +103,7 @@ module Chouette private def local_time time return time unless stop_point&.stop_area&.time_zone.present? + return time unless ActiveSupport::TimeZone[stop_point.stop_area.time_zone].present? time + ActiveSupport::TimeZone[stop_point.stop_area.time_zone].utc_offset end |