diff --git a/app/controllers/vehicles_controller.rb b/app/controllers/vehicles_controller.rb index 02d108a..7de3cc7 100644 --- a/app/controllers/vehicles_controller.rb +++ b/app/controllers/vehicles_controller.rb @@ -27,13 +27,13 @@ class VehiclesController < ApplicationController @customer = Customer.find_by(id: params[:customer_id]) return render_404 unless @customer - @vehicles = @customer.vehicles.order(:year, :make, :model).paginate(page: params[:page]) + paginate_vehicles(@customer.vehicles.order(:year, :make, :model, :id)) return end if params[:search].present? - @vehicles = Vehicle.search_all(params[:search]).paginate(page: params[:page]) - redirect_to @vehicles.first if @vehicles.total_entries == 1 + paginate_vehicles(Vehicle.search_all(params[:search]).order(:id)) + redirect_to @vehicles.first if @vehicle_count == 1 end end @@ -115,4 +115,11 @@ class VehiclesController < ApplicationController render_404 end + # Redmine's paging: @vehicle_count, @vehicle_pages and this page's @vehicles + def paginate_vehicles(scope) + @vehicle_count = scope.count + @vehicle_pages = Paginator.new @vehicle_count, per_page_option, params['page'] + @vehicles = scope.limit(@vehicle_pages.per_page).offset(@vehicle_pages.offset).to_a + end + end diff --git a/app/views/customers/_show_hook.html.erb b/app/views/customers/_show_hook.html.erb index 40ed8f8..eff8760 100644 --- a/app/views/customers/_show_hook.html.erb +++ b/app/views/customers/_show_hook.html.erb @@ -1,7 +1,12 @@ <% if User.current.allowed_to?(:view_vehicles, nil, global: true) %>

<%=t(:field_vehicles)%>:

<%# Own page parameter so this list doesn't page together with the other lists on the customer page %> -<%= render partial: 'vehicles/list', locals: { vehicles: customer.vehicles.paginate(page: params[:vehicles_page]), show_customer: false, show_checkbox: true, page_param: :vehicles_page } %> +<% vehicle_scope = customer.vehicles.order(:year, :make, :model, :id) %> +<% vehicle_count = vehicle_scope.count %> +<% vehicle_pages = Redmine::Pagination::Paginator.new(vehicle_count, Setting.per_page_options_array.first || 25, params[:vehicles_page], :vehicles_page) %> +<%= render partial: 'vehicles/list', locals: { vehicles: vehicle_scope.limit(vehicle_pages.per_page).offset(vehicle_pages.offset).to_a, + pages: vehicle_pages, count: vehicle_count, per_page_links: false, + show_customer: false, show_checkbox: true } %>
<% if User.current.allowed_to?(:add_vehicles, nil, global: true) %> <%= button_to t(:button_new_vehicle), new_customer_vehicle_path(customer), method: :get %> diff --git a/app/views/vehicles/_list.html.erb b/app/views/vehicles/_list.html.erb index 5b8b7fc..8a93f9d 100644 --- a/app/views/vehicles/_list.html.erb +++ b/app/views/vehicles/_list.html.erb @@ -40,11 +40,12 @@
<% end %> -
- <%= will_paginate vehicles, param_name: (local_assigns[:page_param] || :page) %> -
+ <%# pages: a Redmine::Pagination::Paginator for the list (count: how many in all); per_page_links: false to leave out "Per page" %> + <% if local_assigns[:pages] %> + <%= pagination_links_full pages, count, per_page_links: local_assigns[:per_page_links] %> + <% end %> -<%=t(:label_matching)%> <%= vehicles.respond_to?(:total_entries) ? vehicles.total_entries : vehicles.size %> <%=t(:field_vehicles) %> +<%=t(:label_matching)%> <%= local_assigns[:count] || vehicles.size %> <%=t(:field_vehicles) %> <% else %>

<%=t(:label_no_vehicles)%> <%= params[:search] %>.

diff --git a/app/views/vehicles/index.html.erb b/app/views/vehicles/index.html.erb index 9d072fc..b94eaad 100644 --- a/app/views/vehicles/index.html.erb +++ b/app/views/vehicles/index.html.erb @@ -1,4 +1,4 @@

<%=t(:label_customer_vehicles)%> <%= render partial: 'vehicles/search' %>


-<%= render partial: 'vehicles/list', locals: {vehicles: @vehicles, show_customer: true, show_checkbox: false} %> +<%= render partial: 'vehicles/list', locals: {vehicles: @vehicles, pages: @vehicle_pages, count: @vehicle_count, show_customer: true, show_checkbox: false} %>