mirror of
https://github.com/rickbarrette/redmine_qbo_vehicles.git
synced 2026-04-02 07:01:59 -04:00
fixed eager loading issue
This commit is contained in:
@@ -60,10 +60,15 @@ class VehiclesController < ApplicationController
|
|||||||
# display a specific vehicle
|
# display a specific vehicle
|
||||||
def show
|
def show
|
||||||
begin
|
begin
|
||||||
@vehicle = Vehicle.find_by_id(params[:id])
|
@vehicle = Vehicle.includes(issues: [:estimate, :invoices]).find(params[:id])
|
||||||
@vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
|
@vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
|
||||||
@issues = @vehicle.issues.order(id: :desc)
|
@issues = @vehicle.issues
|
||||||
@closed_issues = (@issues - @issues.open)
|
.joins(:status)
|
||||||
|
.includes(:estimate, :invoices, :status, :project, :tracker, :priority)
|
||||||
|
.order(id: :desc)
|
||||||
|
@open_issues = @issues.select { |i| !i.status.is_closed }
|
||||||
|
@closed_issues = @issues.select { |i| i.status.is_closed }
|
||||||
|
|
||||||
flash[:error] = t :alert_no_customer if @vehicle.customer.nil?
|
flash[:error] = t :alert_no_customer if @vehicle.customer.nil?
|
||||||
rescue
|
rescue
|
||||||
flash[:error] = t :alert_vehicle_not_found
|
flash[:error] = t :alert_vehicle_not_found
|
||||||
|
|||||||
@@ -14,9 +14,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h3><%=@issues.open.count%> <%=t(:label_open_issues)%></h3>
|
<h3><%=@open_issues.count%> <%=t(:label_open_issues)%></h3>
|
||||||
|
|
||||||
<%= render partial: 'issues/list_simple', locals: {issues: @issues.open} %>
|
<%= render partial: 'issues/list_simple', locals: {issues: @open_issues} %>
|
||||||
|
|
||||||
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
|
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user