diff options
| author | Luc Donnet | 2018-01-08 09:21:20 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-08 09:21:20 +0100 |
| commit | 93f747713a2349cb3360e5e53aceac26a0b5d439 (patch) | |
| tree | 9d00b562f1398393822c6cda98be9a25216b8bba | |
| parent | 7b88e236eba4fbe3d7d6babc01a2ec9d8d7b251e (diff) | |
| parent | de4df1dfe13dd9a1b61d14bfecdec1b669cce1ba (diff) | |
| download | chouette-core-93f747713a2349cb3360e5e53aceac26a0b5d439.tar.bz2 | |
Merge pull request #207 from af83/5444-add-company-filter-on-referentialjourneys-index
5444 Filter VJs on company in ReferentialVJs#index
| -rw-r--r-- | app/controllers/referential_vehicle_journeys_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/referential_vehicle_journeys/_filters.html.slim | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb index ad08699a5..8445fc423 100644 --- a/app/controllers/referential_vehicle_journeys_controller.rb +++ b/app/controllers/referential_vehicle_journeys_controller.rb @@ -12,6 +12,7 @@ class ReferentialVehicleJourneysController < ChouetteController def collection @q ||= end_of_association_chain.ransack(params[:q]) @vehicle_journeys ||= @q.result.includes(:vehicle_journey_at_stops).paginate page: params[:page], per_page: 10 + @all_companies = Chouette::Company.where("id IN (#{@referential.vehicle_journeys.select(:company_id).to_sql})").distinct end end diff --git a/app/views/referential_vehicle_journeys/_filters.html.slim b/app/views/referential_vehicle_journeys/_filters.html.slim index 963da8cea..6d22e1378 100644 --- a/app/views/referential_vehicle_journeys/_filters.html.slim +++ b/app/views/referential_vehicle_journeys/_filters.html.slim @@ -5,6 +5,10 @@ span.input-group-btn button.btn.btn-default#search-btn type='submit' span.fa.fa-search + .ffg-row + .form-group.togglable + = f.label Chouette::VehicleJourney.human_attribute_name(:company_id), required: false, class: 'control-label' + = f.input :company_id_eq_any, collection: @all_companies.select(:id, :name).order(name: :asc), as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + l.name + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'} .actions = link_to 'Effacer', referential_vehicle_journeys_path(@referential), class: 'btn btn-link' |