diff options
| author | Alban Peignier | 2015-06-09 13:03:16 +0200 |
|---|---|---|
| committer | Alban Peignier | 2015-06-09 13:03:36 +0200 |
| commit | 3e181432040a2a274591b0b603de94091f81253c (patch) | |
| tree | 0afa3ab18445de2181b5269acb702b05660ed4b1 | |
| parent | 12de64edc5206906680f12c2ba0b3883e7552058 (diff) | |
| download | chouette-core-3e181432040a2a274591b0b603de94091f81253c.tar.bz2 | |
Fixes VehicleFilter requests for without_any_passing_time? or without_any_time_table?
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | app/models/vehicle_filter.rb | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f3e4c0019..d74ce823b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/afimb/ninoxe.git - revision: 50da03899e56131197c0d163db30e0881368ef5b + revision: 5eb3f53d63e22055b939bd96da586020bd176514 branch: rails4 specs: ninoxe (1.1.5) @@ -151,6 +151,7 @@ GEM faraday (>= 0.7.4, < 0.10) fastercsv (1.5.5) ffi (1.9.8) + ffi (1.9.8-java) ffi-geos (1.0.0) ffi (>= 1.0.0) font-awesome-sass (4.2.2) @@ -559,3 +560,6 @@ DEPENDENCIES warbler will_paginate (~> 3.0.7) will_paginate-bootstrap (~> 1.0.1) + +BUNDLED WITH + 1.10.3 diff --git a/app/models/vehicle_filter.rb b/app/models/vehicle_filter.rb index 2ddb76991..64cc3e75a 100644 --- a/app/models/vehicle_filter.rb +++ b/app/models/vehicle_filter.rb @@ -17,14 +17,14 @@ class VehicleFilter end def vehicles_passing_time_filtered if without_any_passing_time? - route.vehicle_journeys.joins(:vehicle_journey_at_stops).where(vehicle_journey_at_stops: { id: nil}) + route.vehicle_journeys.without_any_passing_time else route.sorted_vehicle_journeys end end def vehicle_journeys if without_any_time_table? - vehicles_passing_time_filtered.joins(:time_tables).where(:time_tables => { :id => nil}) + vehicles_passing_time_filtered.without_any_time_table elsif time_table_ids.empty? vehicles_passing_time_filtered else |