From 1550eedb5a4ee4082f64dff8d662cc7beaf8b419 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Wed, 30 Oct 2019 11:53:44 +0100 Subject: [PATCH] Add additional eager loading annotations --- app/controllers/admin/finances_controller.rb | 4 ++-- app/controllers/finance/bank_transactions_controller.rb | 2 +- app/controllers/finance/financial_links_controller.rb | 6 +++--- app/views/finance/invoices/unpaid.html.haml | 2 +- app/views/home/index.html.haml | 2 +- .../index/latest_public_messages_index.html.haml.deface | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/admin/finances_controller.rb b/app/controllers/admin/finances_controller.rb index 81380fd8..3b18da5b 100644 --- a/app/controllers/admin/finances_controller.rb +++ b/app/controllers/admin/finances_controller.rb @@ -3,7 +3,7 @@ class Admin::FinancesController < Admin::BaseController def index @bank_accounts = BankAccount.order('name') - @financial_transaction_classes = FinancialTransactionClass.order('name ASC') + @financial_transaction_classes = FinancialTransactionClass.includes(:financial_transaction_types).order('name ASC') end def update_bank_accounts @@ -12,7 +12,7 @@ class Admin::FinancesController < Admin::BaseController end def update_transaction_types - @financial_transaction_classes = FinancialTransactionClass.order('name ASC') + @financial_transaction_classes = FinancialTransactionClass.includes(:financial_transaction_types).order('name ASC') render :layout => false end diff --git a/app/controllers/finance/bank_transactions_controller.rb b/app/controllers/finance/bank_transactions_controller.rb index 2d409ce0..555e923a 100644 --- a/app/controllers/finance/bank_transactions_controller.rb +++ b/app/controllers/finance/bank_transactions_controller.rb @@ -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 diff --git a/app/controllers/finance/financial_links_controller.rb b/app/controllers/finance/financial_links_controller.rb index 68f062e8..91f34b72 100644 --- a/app/controllers/finance/financial_links_controller.rb +++ b/app/controllers/finance/financial_links_controller.rb @@ -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 diff --git a/app/views/finance/invoices/unpaid.html.haml b/app/views/finance/invoices/unpaid.html.haml index 971579cd..20cefc8e 100644 --- a/app/views/finance/invoices/unpaid.html.haml +++ b/app/views/finance/invoices/unpaid.html.haml @@ -1,7 +1,7 @@ - title t('.title') - for supplier in @suppliers - - invoices = supplier.invoices.unpaid + - invoices = supplier.invoices - if invoices.any? %h3= supplier.name - invoices_sum = 0 diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 8a80a39e..5e9c9122 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -73,7 +73,7 @@ - FinancialTransactionClass.sorted.each do |fc| %th = fc.display - - for ft in current_user.ordergroup.financial_transactions.limit(5).order('created_on DESC') + - for ft in current_user.ordergroup.financial_transactions.includes(:financial_transaction_type, :user).limit(5).order('created_on DESC') %tr %td= format_time(ft.created_on) %td= h(show_user(ft.user)) diff --git a/plugins/messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface b/plugins/messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface index 3a999d8c..65aafbae 100644 --- a/plugins/messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface +++ b/plugins/messages/app/overrides/home/index/latest_public_messages_index.html.haml.deface @@ -3,5 +3,5 @@ - unless Message.readable_for(current_user).empty? %section#messages %h2= t '.messages.title' - = render 'messages/messages', messages: Message.readable_for(current_user).order('created_at DESC').limit(5), pagination: false + = render 'messages/messages', messages: Message.readable_for(current_user).includes(:sender).order('created_at DESC').limit(5), pagination: false %p= raw t '.messages.view_all.text', messages: link_to(t('.messages.view_all.messages'), messages_path), threads: link_to(t('.messages.view_all.threads'), message_threads_path)