diff options
| -rw-r--r-- | app/controllers/referential_vehicle_journeys_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/referential_vehicle_journeys/_filters.html.slim | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb index b07d6c600..b48ef558b 100644 --- a/app/controllers/referential_vehicle_journeys_controller.rb +++ b/app/controllers/referential_vehicle_journeys_controller.rb @@ -35,8 +35,9 @@ class ReferentialVehicleJourneysController < ChouetteController @vehicle_journeys ||= @q.result @vehicle_journeys = parse_order @vehicle_journeys @vehicle_journeys = @vehicle_journeys.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_companies = Chouette::Company.where("id IN (#{@referential.vehicle_journeys.select(:company_id).to_sql})").group("companies.id") + # @all_companies = Chouette::Company.where(id: @referential.vehicle_journeys.pluck(:company_id).uniq).group() + binding.pry end def parse_order scope diff --git a/app/views/referential_vehicle_journeys/_filters.html.slim b/app/views/referential_vehicle_journeys/_filters.html.slim index f1fbdb5d8..87ec8551e 100644 --- a/app/views/referential_vehicle_journeys/_filters.html.slim +++ b/app/views/referential_vehicle_journeys/_filters.html.slim @@ -11,8 +11,8 @@ = %w(10 50 100).each_with_index.map{ |v, i| (params[:per_page] == v || params[:per_page].nil? && i == 0) ? "<span class='selected'>#{v}</span>" : link_to(v, referential_vehicle_journeys_path(@referential, q: params[:q], per_page: v)) }.join(' - ').html_safe .form-group.togglable class=filter_item_class(params[:q], :company_id_eq_any) = f.label Chouette::VehicleJourney.human_attribute_name(:company), required: false, class: 'control-label' - - if @all_companies.present? - = 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'} + - if @all_companies.any? + = f.input :company_id_eq_any, collection: @all_companies.select(:id, :name, :custom_field_values).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'} - else = f.input :company_id_eq_any, collection: [[I18n.t('companies.search_no_results_for_filter'), nil]], as: :check_boxes, label: false, disabled: true, required: false, wrapper_html: { class: 'checkbox_list disabled'} |