diff --git a/app/controllers/equipment_items_controller.rb b/app/controllers/equipment_items_controller.rb index 8a8dfe9d4..4b1537946 100644 --- a/app/controllers/equipment_items_controller.rb +++ b/app/controllers/equipment_items_controller.rb @@ -26,11 +26,11 @@ def set_equipment_model_if_possible def index method = params[:show_deleted] ? :all : :active - if @equipment_model - @equipment_items = @equipment_model.equipment_items.send(method) - else - @equipment_items = EquipmentItem.send(method) - end + @equipment_items = if @equipment_model + @equipment_model.equipment_items.send(method) + else + EquipmentItem.send(method).includes(:equipment_model) + end respond_to do |format| format.html format.zip { download_equipment_data } diff --git a/app/controllers/requirements_controller.rb b/app/controllers/requirements_controller.rb index 1a0f4e307..bf8d253f2 100644 --- a/app/controllers/requirements_controller.rb +++ b/app/controllers/requirements_controller.rb @@ -10,7 +10,7 @@ def set_current_requirement # ------------- end before filter methods ------------- # def index - @requirements = Requirement.all + @requirements = Requirement.all.includes(:equipment_models) end def show diff --git a/app/controllers/reservations_controller.rb b/app/controllers/reservations_controller.rb index 5d5d65c06..4fecdb787 100644 --- a/app/controllers/reservations_controller.rb +++ b/app/controllers/reservations_controller.rb @@ -384,8 +384,12 @@ def upcoming end def manage # initializer - @check_out_set = @user.due_for_checkout.includes(:equipment_model) - @check_in_set = @user.due_for_checkin.includes(:equipment_model) + @check_out_set = @user.due_for_checkout + .includes(equipment_model: [:checkout_procedures, + :checkin_procedures]) + @check_in_set = @user.due_for_checkin + .includes(equipment_model: [:checkout_procedures, + :checkin_procedures]) render :manage, layout: 'application' end