From 76abc55ed7aeb07cf65ed2a027ad2cdc694c5751 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Thu, 4 May 2017 17:18:05 +0200
Subject: VehicleJourneysCtl#collection: Use VehicleJourney.with_stops

Use the class method to get the vehicle journeys in the proper order of
departure time ascending.

The `.with_stops` method replicates this same SQL sequence of joins and
order.

Refs #3268
---
 app/controllers/vehicle_journeys_controller.rb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index f692f3628..316652ca2 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -77,15 +77,7 @@ class VehicleJourneysController < ChouetteController
 
   protected
   def collection
-    scope = route.vehicle_journeys
-      .joins(:journey_pattern)
-      .joins('
-        LEFT JOIN "vehicle_journey_at_stops"
-          ON "vehicle_journey_at_stops"."vehicle_journey_id" = "vehicle_journeys"."id"
-          AND "vehicle_journey_at_stops"."stop_point_id" =
-            "journey_patterns"."departure_stop_point_id"
-      ')
-      .order("vehicle_journey_at_stops.departure_time")
+    scope = route.vehicle_journeys.with_stops
 
     @q = scope.search filtered_ransack_params
     grouping = ransack_periode_filter
-- 
cgit v1.2.3