Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Add additional eager loading annotations

Browse source
This commit is contained in:
Patrick Gansterer 2019-10-30 11:53:44 +01:00
parent 39aff78f11
commit 1550eedb5a
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/finance/bank_transactions_controller.rb
View file

@ -17,7 +17,7 @@ class Finance::BankTransactionsController < ApplicationController
end
@bank_account = BankAccount.find(params[:bank_account_id])
@bank_transactions = @bank_account.bank_transactions.order(sort)
@bank_transactions = @bank_account.bank_transactions.order(sort).includes(:financial_link)
@bank_transactions = @bank_transactions.where('reference LIKE ? OR text LIKE ?', "%#{params[:query]}%", "%#{params[:query]}%") unless params[:query].nil?
@bank_transactions = @bank_transactions.page(params[:page]).per(@per_page)
end

6
app/controllers/finance/financial_links_controller.rb
View file

@ -22,7 +22,7 @@ class Finance::FinancialLinksController < Finance::BaseController
remove_path: remove_financial_transaction_finance_link_path(@financial_link, ft)
}
end
@items += @financial_link.invoices.map do |invoice|
@items += @financial_link.invoices.includes(:supplier).map do |invoice|
{
date: invoice.date || invoice.created_at,
type: t('activerecord.models.invoice'),
@ -61,7 +61,7 @@ class Finance::FinancialLinksController < Finance::BaseController
end
def index_financial_transaction
@financial_transactions = FinancialTransaction.without_financial_link
@financial_transactions = FinancialTransaction.without_financial_link.includes(:financial_transaction_type, :ordergroup)
end
def add_financial_transaction
@ -77,7 +77,7 @@ class Finance::FinancialLinksController < Finance::BaseController
end
def index_invoice
@invoices = Invoice.without_financial_link
@invoices = Invoice.without_financial_link.includes(:supplier)
end
def add_invoice