aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorZog2018-01-12 11:31:14 +0100
committerZog2018-01-12 11:31:14 +0100
commit87841876b7fa2fdc9cee77cc465fa6e8db9fc417 (patch)
treea40cea5d71b554f1398c966dd34b6b5db447d789 /app/controllers
parent216821cbc5410a1377dd57b09ee2753aee13e37c (diff)
downloadchouette-core-87841876b7fa2fdc9cee77cc465fa6e8db9fc417.tar.bz2
Refs #5571 @0.25h; Let the user select the number of items per page5571-remove-pagination-on-referential-vjs-index
on ReferentialVehicleJourneys#index
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/referential_vehicle_journeys_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb
index f93de29cc..89b3703a0 100644
--- a/app/controllers/referential_vehicle_journeys_controller.rb
+++ b/app/controllers/referential_vehicle_journeys_controller.rb
@@ -13,7 +13,7 @@ class ReferentialVehicleJourneysController < ChouetteController
@q ||= end_of_association_chain
@q = @q.with_stop_area_ids(params[:q][:stop_area_ids]) if params[:q] && params[:q][:stop_area_ids]
@q = @q.ransack(params[:q])
- @vehicle_journeys ||= @q.result.order(:published_journey_name).includes(:vehicle_journey_at_stops).paginate page: params[:page], per_page: 10
+ @vehicle_journeys ||= @q.result.order(:published_journey_name).includes(:vehicle_journey_at_stops).paginate page: params[:page], per_page: params[:per_page] || 10
@all_companies = Chouette::Company.where("id IN (#{@referential.vehicle_journeys.select(:company_id).to_sql})").distinct
@all_stop_areas = Chouette::StopArea.where("id IN (#{@referential.vehicle_journeys.joins(:stop_areas).select("stop_areas.id").to_sql})").distinct
end