diff options
| author | Robert | 2017-05-12 08:29:03 +0200 |
|---|---|---|
| committer | Robert | 2017-05-12 08:29:03 +0200 |
| commit | a0eb6ea4e8f3ae56a691820a50958a4acf92bcb5 (patch) | |
| tree | c14da433ba7754b01f47894f27d1a793cb3e6c6a /app/controllers | |
| parent | c007b5f1442b903948373337a6cc7d7d42364b41 (diff) | |
| parent | 1f6fb9c73206f3984d2f942d5d16fb9c094b2164 (diff) | |
| download | chouette-core-a0eb6ea4e8f3ae56a691820a50958a4acf92bcb5.tar.bz2 | |
Merge branch 'master' of github.com:af83/stif-boiv
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/workbenches_controller.rb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 316652ca2..a44a03886 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -80,8 +80,10 @@ class VehicleJourneysController < ChouetteController scope = route.vehicle_journeys.with_stops @q = scope.search filtered_ransack_params - grouping = ransack_periode_filter - @q.build_grouping(grouping) if grouping + + # Fixme 3358 + # grouping = ransack_periode_filter + # @q.build_grouping(grouping) if grouping @ppage = 20 @vehicle_journeys = @q.result.paginate(:page => params[:page], :per_page => @ppage) diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb index d621a28d7..ccd55965b 100644 --- a/app/controllers/workbenches_controller.rb +++ b/app/controllers/workbenches_controller.rb @@ -68,7 +68,7 @@ class WorkbenchesController < BreadcrumbController def ransack_periode scope return scope unless params[:q] && params[:q]['validity_period'] periode = params[:q]['validity_period'] - return scope if periode['end_lteq(1i)'].empty? || periode['begin_gteq(1i)'].empty? + return scope if periode['end_lteq(1i)'].blank? || periode['begin_gteq(1i)'].blank? begin_range = Date.civil(periode["begin_gteq(1i)"].to_i, periode["begin_gteq(2i)"].to_i, periode["begin_gteq(3i)"].to_i) end_range = Date.civil(periode["end_lteq(1i)"].to_i, periode["end_lteq(2i)"].to_i, periode["end_lteq(3i)"].to_i) |