diff --git a/app/controllers/vehicles_controller.rb b/app/controllers/vehicles_controller.rb index 9029427..4336821 100644 --- a/app/controllers/vehicles_controller.rb +++ b/app/controllers/vehicles_controller.rb @@ -62,6 +62,8 @@ class VehiclesController < ApplicationController begin @vehicle = Vehicle.find_by_id(params[:id]) @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin + @issues = @vehicle.issues.order(id: :desc) + @closed_issues = (@issues - @issues.open) rescue ActiveRecord::RecordNotFound render_404 end diff --git a/app/views/vehicles/_details.html.erb b/app/views/vehicles/_details.html.erb index 65e6a69..dcb5e1d 100644 --- a/app/views/vehicles/_details.html.erb +++ b/app/views/vehicles/_details.html.erb @@ -21,11 +21,6 @@ <%= vehicle.notes %> - - <%= t(:issues) %> - <%= vehicle.issues.count %> - - <%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%> diff --git a/app/views/vehicles/show.html.erb b/app/views/vehicles/show.html.erb index ff8f527..f8607b2 100644 --- a/app/views/vehicles/show.html.erb +++ b/app/views/vehicles/show.html.erb @@ -4,11 +4,11 @@
<%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %> -

<%=t(:label_open_issues)%>

+

<%=@issues.open.count%> <%=t(:label_open_issues)%>

- <%= render :partial => 'issues/list_simple', locals: {issues: @vehicle.issues.open} %> + <%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %> -

<%=t(:label_closed_issues)%>

+

<%=@closed_issues.count%> <%=t(:label_closed_issues)%>

- <%= render :partial => 'issues/list_simple', locals: {issues: (@vehicle.issues - @vehicle.issues.open)} %> + <%= render :partial => 'issues/list_simple', locals: {issues: (@closed_issues)} %>