Attachment 1470560 Details for Bug 1608597 – Proposed Patch 001

[patch] Proposed Patch 001

1608597.patch (text/plain), 1.78 KB, created by Mike McCune on 2018-07-25 22:34:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike McCune

Created: 2018-07-25 22:34:04 UTC

Size: 1.78 KB

patch

obsolete

>diff --git a/app/models/katello/rpm.rb b/app/models/katello/rpm.rb
>index bc90e4f45b..16576bbf0e 100644
>--- a/app/models/katello/rpm.rb
>+++ b/app/models/katello/rpm.rb
>@@ -79,16 +79,25 @@ module Katello
>         where("#{Katello::ContentFacetRepository.table_name}.repository_id = #{Katello::RepositoryRpm.table_name}.repository_id").uniq
>     end
> 
>+
>     def self.installable_for_hosts(hosts = nil)
>-      query = Katello::Rpm.joins(:content_facet_applicable_rpms).joins(:repository_rpms).
>+      hosts = ::Host.where(:id => hosts) if hosts && hosts.is_a?(Array)
>+
>+      query = Katello::Rpm.joins(:content_facet_applicable_rpms).
>         joins("INNER JOIN #{Katello::ContentFacetRepository.table_name} on \
>         #{Katello::ContentFacetRepository.table_name}.content_facet_id = #{Katello::ContentFacetApplicableRpm.table_name}.content_facet_id").
>         joins("INNER JOIN #{Katello::RepositoryRpm.table_name} AS host_repo_rpm ON \
>-          host_repo_rpm.rpm_id = #{Katello::Rpm.table_name}.id").
>-        where("#{Katello::ContentFacetRepository.table_name}.repository_id = host_repo_rpm.repository_id")
>+          host_repo_rpm.rpm_id = #{Katello::Rpm.table_name}.id AND \
>+          #{Katello::ContentFacetRepository.table_name}.repository_id = host_repo_rpm.repository_id")
>+
>+      if hosts
>+        query = query.where("#{Katello::ContentFacetRepository.table_name}.content_facet_id" => hosts.joins(:content_facet)
>+                                .select("#{Katello::Host::ContentFacet.table_name}.id"))
>+      else
>+        query = query.joins(:content_facet_applicable_rpms)
>+      end
> 
>-      query = query.joins(:content_facets).where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts.map(&:id)) if hosts
>-      query.uniq
>+      query
>     end
> 
>     def self.applicable_to_hosts(hosts)

Actions: View | Diff

Attachments on bug 1608597: 1470560 | 1470886 | 1473222