From 11f694d828fbb6a2d6ba124a2d0b7976a6163cd8 Mon Sep 17 00:00:00 2001 From: Shimon Shtein Date: Thu, 4 May 2017 13:58:55 +0300 Subject: [PATCH] Fixes #19461 - Change includes to preload in host scopes --- lib/katello/plugin.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/katello/plugin.rb b/lib/katello/plugin.rb index c372cff8aa2..d347e9e68f0 100644 --- a/lib/katello/plugin.rb +++ b/lib/katello/plugin.rb @@ -246,14 +246,14 @@ add_controller_action_scope(HostsController, :index) do |base_scope| base_scope - .includes(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata) - .includes(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment]) + .preload(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata) + .preload(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment]) end add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope| base_scope - .includes(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata) - .includes(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment]) + .preload(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata) + .preload(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment]) end Katello::PermissionCreator.new(self).define