diff options
| author | teddywing | 2017-05-04 17:21:03 +0200 |
|---|---|---|
| committer | GitHub | 2017-05-04 17:21:03 +0200 |
| commit | f9a3cec2a44a817ae21a446987983aed43fd383a (patch) | |
| tree | 239f14f1c9fe1dd52307de0056e7c85649deda51 | |
| parent | a6ebcdf634df9c75fc1a207d9eb7f8f527fa8818 (diff) | |
| parent | 76abc55ed7aeb07cf65ed2a027ad2cdc694c5751 (diff) | |
| download | chouette-core-f9a3cec2a44a817ae21a446987983aed43fd383a.tar.bz2 | |
Merge pull request #10 from af83/3268-vehicle-journey-times--order-vehicle-journeys-display-journey-with-earliest-stop-first--rb20170504170900
VehicleJourneysCtl#collection: Use VehicleJourney.with_stops
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 10 |
1 files changed, 1 insertions, 9 deletions
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 |