diff options
| author | Robert | 2017-05-31 12:03:51 +0200 |
|---|---|---|
| committer | Robert | 2017-05-31 12:03:51 +0200 |
| commit | 203b94aac86fc18ccb68885dea188a972cea870d (patch) | |
| tree | a1af04a486c53accb470b3a9c19c6af16bbcea86 | |
| parent | f2a551a38651886e68b4ce73ff8ce6ce58899b72 (diff) | |
| parent | c997cb1a42075f2464f8c76165005707126f8a44 (diff) | |
| download | chouette-core-203b94aac86fc18ccb68885dea188a972cea870d.tar.bz2 | |
Merge branch 'master' of github.com:af83/stif-boiv
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js index e2d03e195..c9b5368a1 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js @@ -126,7 +126,7 @@ const Filters = ({filters, pagination, onFilter, onResetFilters, onUpdateStartTi onChange={onToggleWithoutTimeTable} checked={filters.query.withoutTimeTable} ></input> - <span className='switch-label' data-checkedvalue='Oui' data-uncheckedvalue='Non'></span> + <span className='switch-label' data-checkedvalue='Non' data-uncheckedvalue='Oui'></span> </label> </div> </div> diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js index 2a76ae43a..97aa60526 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js @@ -48,7 +48,7 @@ var initialState = { comment: '' }, withoutSchedule: true, - withoutTimeTable: false + withoutTimeTable: true } }, diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index b48cae2e9..d31d7b27e 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -115,7 +115,7 @@ class VehicleJourneysController < ChouetteController def maybe_filter_out_journeys_with_time_tables(scope) if params[:q] && - params[:q][:vehicle_journey_without_time_table] == 'true' + params[:q][:vehicle_journey_without_time_table] == 'false' return scope .without_time_tables end |