aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinhui2017-03-10 10:58:44 +0100
committerXinhui2017-03-10 10:58:44 +0100
commit9a0e95969b9afaf6b5c63752d3963a96f4e50fb0 (patch)
tree33fa0768cf02469ea8b80cd89dbb825214df1357
parent3ec5c7bf65b267ce96431906feb6025cfbff347a (diff)
downloadchouette-core-9a0e95969b9afaf6b5c63752d3963a96f4e50fb0.tar.bz2
Fix vehicle_journeys#index should display vj without time_tables
Refs #2507
-rw-r--r--app/models/chouette/route.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 1b9e427ef..39c245bc9 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -110,7 +110,8 @@ class Chouette::Route < Chouette::TridentActiveRecord
def sorted_vehicle_journeys(journey_category_model)
send(journey_category_model)
- .joins(:journey_pattern, :vehicle_journey_at_stops, :time_tables)
+ .joins(:journey_pattern, :vehicle_journey_at_stops)
+ .joins('LEFT JOIN "time_tables_vehicle_journeys" ON "time_tables_vehicle_journeys"."vehicle_journey_id" = "vehicle_journeys"."id" LEFT JOIN "time_tables" ON "time_tables"."id" = "time_tables_vehicle_journeys"."time_table_id"')
.where("vehicle_journey_at_stops.stop_point_id=journey_patterns.departure_stop_point_id")
.order("vehicle_journey_at_stops.departure_time")
end