From 614ec0b74057e5c418524343994403a457a65f3b Mon Sep 17 00:00:00 2001 From: Jeremy Lenz Date: Thu, 23 Jan 2025 13:48:27 -0500 Subject: [PATCH] Fixes #38142 - Add MultiCV methods to jail for hosts and activation keys reporting (#11279) --- app/models/katello/activation_key.rb | 2 +- app/models/katello/concerns/host_managed_extensions.rb | 6 +++--- app/models/katello/host/content_facet.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/katello/activation_key.rb b/app/models/katello/activation_key.rb index 4666df4d71d..414f8ba8eda 100644 --- a/app/models/katello/activation_key.rb +++ b/app/models/katello/activation_key.rb @@ -290,7 +290,7 @@ def check_cves property :name, String, desc: 'Returns the name of the Activation Key.' end class Jail < ::Safemode::Jail - allow :name + allow :name, :content_view_environment_labels, :multi_content_view_environment? end end end diff --git a/app/models/katello/concerns/host_managed_extensions.rb b/app/models/katello/concerns/host_managed_extensions.rb index 6d4b6af71c2..6b0be959ff8 100644 --- a/app/models/katello/concerns/host_managed_extensions.rb +++ b/app/models/katello/concerns/host_managed_extensions.rb @@ -89,7 +89,7 @@ def remote_execution_proxies(provider, *_rest) prepend Overrides delegate :content_source_id, :single_content_view, :single_lifecycle_environment, :default_environment?, :single_content_view_environment?, :multi_content_view_environment?, :kickstart_repository_id, :bound_repositories, - :installable_errata, :installable_rpms, :image_mode_host?, to: :content_facet, allow_nil: true + :content_view_environment_labels, :installable_errata, :installable_rpms, :image_mode_host?, to: :content_facet, allow_nil: true delegate :release_version, :purpose_role, :purpose_usage, to: :subscription_facet, allow_nil: true @@ -623,8 +623,8 @@ class ::Host::Managed::Jail < Safemode::Jail :host_collections, :pools, :hypervisor_host, :installed_debs, :installed_packages, :traces_helpers, :advisory_ids, :package_names_for_job_template, :filtered_entitlement_quantity_consumed, :bound_repositories, - :single_content_view, :single_lifecycle_environment, :release_version, - :purpose_role, :purpose_usage + :single_content_view, :single_lifecycle_environment, :content_view_environment_labels, :multi_content_view_environment?, + :release_version, :purpose_role, :purpose_usage end class ActiveRecord::Associations::CollectionProxy::Jail < Safemode::Jail diff --git a/app/models/katello/host/content_facet.rb b/app/models/katello/host/content_facet.rb index 353c010c2a7..426b7036bd1 100644 --- a/app/models/katello/host/content_facet.rb +++ b/app/models/katello/host/content_facet.rb @@ -453,7 +453,7 @@ class Jail < ::Safemode::Jail :errata_counts, :id, :kickstart_repository, :kickstart_repository_id, :kickstart_repository_name, :upgradable_deb_count, :upgradable_module_stream_count, :upgradable_rpm_count, :uuid, :installable_security_errata_count, :installable_bugfix_errata_count, :installable_enhancement_errata_count, - :single_content_view, :single_lifecycle_environment + :single_content_view, :single_lifecycle_environment, :content_view_environment_labels end end end