aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorZog2018-01-12 11:04:16 +0100
committerZog2018-01-12 11:06:15 +0100
commit2e96f2e7f13a1055d6a41c2abc419f126b9bdaf9 (patch)
tree46871e7409c8e8dc1264078261436ab99b1a9fde /app/models
parent216821cbc5410a1377dd57b09ee2753aee13e37c (diff)
downloadchouette-core-5568-fix-vjs-editor.tar.bz2
Refs #5568 @0.25h; Fix VJs editor when a stop has an invalid TZ5568-fix-vjs-editor
Diffstat (limited to 'app/models')
-rw-r--r--app/models/chouette/vehicle_journey_at_stop.rb1
1 files changed, 1 insertions, 0 deletions
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