katello 4.15.0 → 4.16.0.rc1

data/app/lib/katello/validators/alternate_content_source_path_validator.rb

@@ -6,11 +6,11 @@ module Katello
           case attribute
           when :base_url
             unless AlternateContentSourcePathValidator.validate_base_url(value)
-              record.errors[attribute] << N_("%s is not a valid path") % value
+              record.errors.add(attribute, N_("%s is not a valid path") % value)
             end
           when :subpaths
             unless AlternateContentSourcePathValidator.validate_subpaths(value)
-              record.errors[attribute] << N_('All subpaths must have a slash at the end and none at the front')
+              record.errors.add(attribute, N_('All subpaths must have a slash at the end and none at the front'))
             end
           end
         end

data/app/lib/katello/validators/container_image_name_validator.rb

@@ -3,7 +3,7 @@ module Katello
     class ContainerImageNameValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         if value && !ContainerImageNameValidator.validate_name(value)
-          record.errors[attribute] << N_("invalid container image name")
+          record.errors.add(attribute, N_("invalid container image name"))
         end
       end
 

data/app/lib/katello/validators/content_validator.rb

@@ -4,7 +4,7 @@ module Katello
       def validate_each(record, attribute, value)
         value.encode("UTF-8", 'binary') unless value.blank?
       rescue Encoding::UndefinedConversionError
-        record.errors[attribute] << (options[:message] || _("cannot be a binary file."))
+        record.errors.add(attribute, (options[:message] || _("cannot be a binary file.")))
       end
     end
   end

data/app/lib/katello/validators/content_view_environment_coherent_default_validator.rb

@@ -11,8 +11,8 @@ module Katello
             env = KTEnvironment.where(:id => environment_id).first
             return if view.blank? || env.blank?
             if view.default? && !env.library?
-              record.errors[:base] << _("Lifecycle environment '%{env}' cannot be used with content view '%{view}'") %
-                                        {:view => view.name, :env => env.name}
+              record.errors.add(:base, _("Lifecycle environment '%{env}' cannot be used with content view '%{view}'") %
+                                        {:view => view.name, :env => env.name})
             end
           end
         end

data/app/lib/katello/validators/content_view_environment_org_validator.rb

@@ -6,11 +6,11 @@ module Katello
         view = ContentView.where(:id => record.content_view_id).first
         environment = KTEnvironment.where(:id => environment_id).first
         if view.blank? || environment.blank?
-          record.errors[:base] << _("Content view environments must have both a content view and an environment")
+          record.errors.add(:base, _("Content view environments must have both a content view and an environment"))
         end
 
         unless view&.organization == environment&.organization
-          record.errors[:base] << _("%{view_label} could not be promoted to %{environment_label} because the content view and the environment are not in the same organization!") % {:view_label => view&.label, :environment_label => environment&.label}
+          record.errors.add(:base, _("%{view_label} could not be promoted to %{environment_label} because the content view and the environment are not in the same organization!") % {:view_label => view&.label, :environment_label => environment&.label})
         end
       end
     end

data/app/lib/katello/validators/content_view_environment_validator.rb

@@ -10,12 +10,12 @@ module Katello
           if environment_id
             env = KTEnvironment.where(:id => environment_id).first
             unless view.blank? || env.blank? || view.in_environment?(env)
-              record.errors[:base] << _("Content view '%{view}' is not in environment '%{env}'") %
-                                        {:view => view.name, :env => env.name}
+              record.errors.add(:base, _("Content view '%{view}' is not in environment '%{env}'") %
+                                        {:view => view.name, :env => env.name})
             end
           end
           if view&.generated_for_repository?
-            record.errors[:base] << _("Generated content views cannot be assigned to hosts or activation keys")
+            record.errors.add(:base, _("Generated content views cannot be assigned to hosts or activation keys"))
           end
         end
       end

data/app/lib/katello/validators/content_view_erratum_filter_rule_validator.rb

@@ -2,10 +2,10 @@ module Katello
   module Validators
     class ContentViewErratumFilterRuleValidator < ActiveModel::Validator
       def validate(record)
-        if record.errata_id.blank? && record.start_date.blank? && record.end_date.blank? && record.types.blank?
+        if record.errata_id.blank? && record.start_date.blank? && record.end_date.blank? && record.types.blank? && record.allow_other_types == false
           invalid_parameters = _("Invalid erratum filter rule specified, Must specify at least one of the following:" \
-                                     " 'errata_id', 'start_date', 'end_date' or 'types'")
-          record.errors[:base] << invalid_parameters
+            " 'errata_id', 'start_date', 'end_date', 'types', or 'allow_other_types'")
+          record.errors.add(:base, invalid_parameters)
           return
         end
 
@@ -14,7 +14,7 @@ module Katello
                                         !record.types.blank?)
           invalid_parameters = _("Invalid erratum filter rule specified, 'errata_id' cannot be specified in the" \
                                  " same tuple as 'start_date', 'end_date' or 'types'")
-          record.errors[:base] << invalid_parameters
+          record.errors.add(:base, invalid_parameters)
           return
         end
 
@@ -28,13 +28,13 @@ module Katello
           if !record.filter.erratum_rules.empty? &&
              !record.filter.erratum_rules.any? { |rule| rule.id == record.id }
             invalid_parameters = _("May not add a type or date range rule to a filter that has existing rules.")
-            record.errors[:base] << invalid_parameters
+            record.errors.add(:base, invalid_parameters)
           end
 
         else
           if record.filter_has_date_or_type_rule?
             invalid_parameters = _("May not add an id rule to a filter that has an existing type or date range rule.")
-            record.errors[:base] << invalid_parameters
+            record.errors.add(:base, invalid_parameters)
           end
 
         end
@@ -45,14 +45,14 @@ module Katello
         end_date_int = record.end_date.to_time.to_i unless record.end_date.blank?
 
         if start_date_int && (!start_date_int.is_a?(Integer) || !record.start_date.is_a?(String))
-          record.errors[:base] << _("The erratum filter rule start date is in an invalid format or type.")
+          record.errors.add(:base, _("The erratum filter rule start date is in an invalid format or type."))
         end
         if end_date_int && (!end_date_int.is_a?(Integer) || !record.end_date.is_a?(String))
-          record.errors[:base] << _("The erratum filter rule end date is in an invalid format or type.")
+          record.errors.add(:base, _("The erratum filter rule end date is in an invalid format or type."))
         end
 
         if start_date_int && end_date_int && !(start_date_int <= end_date_int)
-          record.errors[:base] << _("Invalid date range. The erratum filter rule start date must come before the end date")
+          record.errors.add(:base, _("Invalid date range. The erratum filter rule start date must come before the end date"))
         end
       end
 
@@ -60,13 +60,13 @@ module Katello
         if record.types.is_a?(Array)
           invalid_types = record.types.collect(&:to_s) - ContentViewErratumFilter::ERRATA_TYPES.keys
           unless invalid_types.empty?
-            record.errors[:base] <<
+            record.errors.add(:base,
                               _("Invalid erratum types %{invalid_types} provided. Erratum type can be any of %{valid_types}") %
                               { :invalid_types => invalid_types.join(","),
-                                :valid_types => ContentViewErratumFilter::ERRATA_TYPES.keys.join(",")}
+                                :valid_types => ContentViewErratumFilter::ERRATA_TYPES.keys.join(",")})
           end
         else
-          record.errors[:base] << _("The erratum type must be an array. Invalid value provided")
+          record.errors.add(:base, _("The erratum type must be an array. Invalid value provided"))
         end
       end
     end

data/app/lib/katello/validators/content_view_filter_version_validator.rb

@@ -5,7 +5,7 @@ module Katello
         if !record.version.blank? && (!record.min_version.blank? || !record.max_version.blank?)
           invalid_parameters = _("Invalid filter rule specified, 'version' cannot be specified in the" \
                                  " same tuple as 'min_version' or 'max_version'")
-          record.errors[:base] << invalid_parameters
+          record.errors.add(:base, invalid_parameters)
         end
       end
     end

data/app/lib/katello/validators/generated_content_view_validator.rb

@@ -6,7 +6,7 @@ module Katello
           if cve.content_view_id
             view = ContentView.where(:id => cve.content_view_id).first
             if view&.generated_for_repository?
-              record.errors[:base] << _("Content view '%{cv_name}' is a generated content view, which cannot be assigned to hosts or activation keys.") % { :cv_name => view.name }
+              record.errors.add(:base, _("Content view '%{cv_name}' is a generated content view, which cannot be assigned to hosts or activation keys.") % { :cv_name => view.name })
             end
           end
         end

data/app/lib/katello/validators/gpg_key_content_type_validator.rb

@@ -6,13 +6,13 @@ module Katello
         # ssl_ca_cert, ssl_client_cert, ssl_client_key of GpgKey.content type "cert"
 
         if !record.gpg_key.blank? && record.gpg_key.content_type != "gpg_key"
-          record.errors[:gpg_key] << _("Wrong content type submitted.")
+          record.errors.add(:gpg_key, _("Wrong content type submitted."))
         end
 
         if record.instance_of?(Katello::Product)
           [:ssl_ca_cert, :ssl_client_cert, :ssl_client_key].each do |cert|
             if !record.send(cert).blank? && record.send(cert).content_type != "cert"
-              record.errors[cert] << _("Wrong content type submitted.")
+              record.errors.add(cert, _("Wrong content type submitted."))
             end
           end
         end

data/app/lib/katello/validators/gpg_key_content_validator.rb

@@ -15,25 +15,25 @@ module Katello
             gpg_key_line_array.pop
 
             if gpg_key_line_array.empty?
-              record.errors[attribute] << _("must contain valid Public GPG Key")
+              record.errors.add(attribute, _("must contain valid Public GPG Key"))
             else
               unless gpg_key_line_array.drop(1).join.match(/[a-zA-Z0-9+\/=]*/)
-                record.errors[attribute] << _("must contain valid Public GPG Key")
+                record.errors.add(attribute, _("must contain valid Public GPG Key"))
               end
             end
 
           else
-            record.errors[attribute] << _("must contain valid Public GPG Key")
+            record.errors.add(attribute, _("must contain valid Public GPG Key"))
           end
 
         else
-          record.errors[attribute] << _("must contain GPG Key")
+          record.errors.add(attribute, _("must contain GPG Key"))
         end
       end
 
       def self.validate_line_length(record, attribute, value)
         value.each_line do |line|
-          record.errors[attribute] << _("must contain valid  Public GPG Key") if line.length > ContentCredential::MAX_CONTENT_LINE_LENGTH
+          record.errors.add(attribute, _("must contain valid  Public GPG Key")) if line.length > ContentCredential::MAX_CONTENT_LINE_LENGTH
         end
       end
     end

data/app/lib/katello/validators/katello_label_format_validator.rb

@@ -3,18 +3,18 @@ module Katello
     class KatelloLabelFormatValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         if value
-          record.errors[attribute] << N_("cannot contain characters other than ascii alpha numerals, '_', '-'. ") unless value =~ /\A[a-zA-Z0-9_\-]+\z/
+          record.errors.add(attribute, N_("cannot contain characters other than ascii alpha numerals, '_', '-'. ")) unless value =~ /\A[a-zA-Z0-9_\-]+\z/
           NoTrailingSpaceValidator.validate_trailing_space(record, attribute, value)
           KatelloLabelFormatValidator.validate_length(record, attribute, value)
         else
-          record.errors[attribute] << N_("can't be blank")
+          record.errors.add(attribute, N_("can't be blank"))
         end
       end
 
       def self.validate_length(record, attribute, value, max_length = 128, min_length = 1)
         if value
-          record.errors[attribute] << N_("cannot contain more than %s characters") % max_length unless value.length <= max_length
-          record.errors[attribute] << N_("must contain at least %s character") % min_length unless value.length >= min_length
+          record.errors.add(attribute, N_("cannot contain more than %s characters") % max_length) unless value.length <= max_length
+          record.errors.add(attribute, N_("must contain at least %s character") % min_length) unless value.length >= min_length
         end
       end
     end

data/app/lib/katello/validators/katello_name_format_validator.rb

@@ -8,13 +8,13 @@ module Katello
           NoTrailingSpaceValidator.validate_trailing_space(record, attribute, value)
           KatelloNameFormatValidator.validate_length(record, attribute, value)
         else
-          record.errors[attribute] << N_("cannot be blank")
+          record.errors.add(attribute, N_("cannot be blank"))
         end
       end
 
       def self.validate_length(record, attribute, value, min_length = 1)
         if value && !(value.length >= min_length)
-          record.errors[attribute] << _("must contain at least %s character") % min_length
+          record.errors.add(attribute, _("must contain at least %s character") % min_length)
         end
       end
     end

data/app/lib/katello/validators/katello_url_format_validator.rb

@@ -13,7 +13,7 @@ module Katello
         end
 
         attribute_name = options[:field_name] || attribute
-        record.errors[attribute_name] << N_("is invalid") unless kurl_valid?(value)
+        record.errors.add(attribute_name, N_("is invalid")) unless kurl_valid?(value)
       end
     end
   end

data/app/lib/katello/validators/library_presence_validator.rb

@@ -2,7 +2,7 @@ module Katello
   module Validators
     class LibraryPresenceValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
-        record.errors[attribute] << N_("must contain '%s'") % "Library" if value.select { |e| e.library }.empty?
+        record.errors.add(attribute, N_("must contain '%s'") % "Library") if value.select { |e| e.library }.empty?
       end
     end
   end

data/app/lib/katello/validators/no_trailing_space_validator.rb

@@ -7,7 +7,7 @@ module Katello
 
       def self.validate_trailing_space(record, attribute, value)
         if value && !(value.strip == value)
-          record.errors[attribute] << _("must not contain leading or trailing white spaces.")
+          record.errors.add(attribute, _("must not contain leading or trailing white spaces."))
         end
       end
     end

data/app/lib/katello/validators/non_library_environment_validator.rb

@@ -3,7 +3,7 @@ module Katello
     class NonLibraryEnvironmentValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         return unless value
-        record.errors[attribute] << N_("Cannot register a system to the '%s' environment") % "Library" if !record.environment.nil? && record.environment.library?
+        record.errors.add(attribute, N_("Cannot register a system to the '%s' environment") % "Library") if !record.environment.nil? && record.environment.library?
       end
     end
   end

data/app/lib/katello/validators/not_in_library_validator.rb

@@ -2,7 +2,7 @@ module Katello
   module Validators
     class NotInLibraryValidator < ActiveModel::Validator
       def validate(record)
-        record.errors[:environment] << _("The '%s' environment cannot contain a changeset!") % "Library" if record.environment.library?
+        record.errors.add(:environment, _("The '%s' environment cannot contain a changeset!") % "Library") if record.environment.library?
       end
     end
   end

data/app/lib/katello/validators/path_descendents_validator.rb

@@ -6,7 +6,7 @@ module Katello
         #environment is not duplicated in its path
         # We do not want circular dependencies
         return if record.prior.nil?
-        record.errors[:prior] << _(" environment cannot be set to an environment already on its path") if duplicate? record.prior
+        record.errors.add(:prior, _(" environment cannot be set to an environment already on its path")) if duplicate? record.prior
       end
 
       def duplicate?(record)

data/app/lib/katello/validators/prior_validator.rb

@@ -8,7 +8,7 @@ module Katello
         # prior to have only one child (unless its the Library)
         ancestor = record.prior
         if ancestor && !ancestor.library? && (ancestor.successors.count == 1 && !ancestor.successors.include?(record))
-          record.errors[:prior] << _("prior environment can only have one child")
+          record.errors.add(:prior, _("prior environment can only have one child"))
         end
       end
     end

data/app/lib/katello/validators/product_unique_attribute_validator.rb

@@ -5,7 +5,7 @@ module Katello
         unique = self.unique_attribute?(record, attribute, value)
 
         unless unique
-          record.errors[attribute] << _("has already been taken for a product in this organization.")
+          record.errors.add(attribute, _("has already been taken for a product in this organization."))
         end
       end
 

data/app/lib/katello/validators/repo_disablement_validator.rb

@@ -3,9 +3,9 @@ module Katello
     class RepoDisablementValidator < ActiveModel::Validator
       def validate(record)
         if record.redhat? && record.enabled_changed? && !record.enabled? && record.promoted?
-          record.errors[:base] << N_("Repository cannot be disabled since it has already been promoted.")
+          record.errors.add(:base, N_("Repository cannot be disabled since it has already been promoted."))
         elsif !record.redhat? && !record.enabled?
-          record.errors[:base] << N_("Custom repositories cannot be disabled.")
+          record.errors.add(:base, N_("Custom repositories cannot be disabled."))
         end
       end
     end

data/app/lib/katello/validators/root_repository_unique_attribute_validator.rb

@@ -5,7 +5,7 @@ module Katello
         exists = RootRepository.where(:product_id => record.product_id, attribute => value).where("id != ?", record.id || -1).exists?
 
         if record.send("#{attribute}_changed?") && record.custom? && exists
-          record.errors[attribute] << _("has already been taken for this product.")
+          record.errors.add(attribute, _("has already been taken for this product."))
         end
       end
     end

data/app/lib/katello/validators/self_reference_environment_validator.rb

@@ -2,7 +2,7 @@ module Katello
   module Validators
     class SelfReferenceEnvironmentValidator < ActiveModel::Validator
       def validate(record)
-        record.errors[:base] << _("Environment cannot be in its own promotion path") if record.priors.select(:id).include? record.id
+        record.errors.add(:base, _("Environment cannot be in its own promotion path")) if record.priors.select(:id).include? record.id
       end
     end
   end

data/app/lib/katello/validators/unique_field_in_org.rb

@@ -7,7 +7,7 @@ module Katello
         if value
           others = record.class.where(attribute => value).joins(:environment).where("#{Katello::KTEnvironment.table_name}.organization_id" => record.environment.organization_id)
           others = others.where("#{record.class.table_name}.id != ?", record.id) if record.persisted?
-          record.errors[attribute] << N_("already taken") if others.any?
+          record.errors.add(attribute, N_("already taken")) if others.any?
         end
       end
     end

data/app/models/katello/activation_key.rb

@@ -27,11 +27,7 @@ module Katello
     has_many :subscription_facet_activation_keys, :class_name => "Katello::SubscriptionFacetActivationKey", :dependent => :destroy
     has_many :subscription_facets, :through => :subscription_facet_activation_keys
 
-    has_many :activation_key_purpose_addons, :class_name => "Katello::ActivationKeyPurposeAddon", :dependent => :destroy, :inverse_of => :activation_key
-    has_many :purpose_addons, :class_name => "Katello::PurposeAddon", :through => :activation_key_purpose_addons
-
     before_destroy :validate_destroyable!
-    accepts_nested_attributes_for :purpose_addons
 
     validates_lengths_from_database
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
@@ -42,16 +38,16 @@ module Katello
     validates_each :max_hosts do |record, attr, value|
       if record.unlimited_hosts
         unless value.nil?
-          record.errors[attr] << _("cannot be set because unlimited hosts is set")
+          record.errors.add(attr, _("cannot be set because unlimited hosts is set"))
         end
       else
         if value.nil?
-          record.errors[attr] << _("cannot be nil")
+          record.errors.add(attr, _("cannot be nil"))
         elsif value <= 0
-          record.errors[attr] << _("cannot be less than one")
+          record.errors.add(attr, _("cannot be less than one"))
         elsif value < record.subscription_facets.length
           # we don't let users to set usage limit lower than current in-use
-          record.errors[attr] << _("cannot be lower than current usage count (%s)" % record.subscription_facets.length)
+          record.errors.add(attr, _("cannot be lower than current usage count (%s)" % record.subscription_facets.length))
         end
       end
     end
@@ -88,7 +84,6 @@ module Katello
                   :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER, :ext_method => :find_by_subscription_id
     scoped_search :on => :purpose_usage, :rename => :usage, :complete_value => true
     scoped_search :on => :purpose_role, :rename => :role, :complete_value => true
-    scoped_search :on => :name, :rename => :addon, :relation => :purpose_addon, :complete_value => true, :ext_method => :find_by_purpose_addons
 
     def self.in_environments(envs)
       with_environments(envs)
@@ -97,7 +92,7 @@ module Katello
     def content_view_environments=(new_cves)
       if new_cves.length > 1 && !Setting['allow_multiple_content_views']
         fail ::Katello::Errors::MultiEnvironmentNotSupportedError,
-        _("Assigning an activation key to multiple content view environments is not enabled.")
+        _("Assigning an activation key to multiple content view environments is not enabled. To enable, set the allow_multiple_content_views setting.")
       end
       super(new_cves)
       Katello::ContentViewEnvironmentActivationKey.reprioritize_for_activation_key(self, new_cves)
@@ -270,12 +265,6 @@ module Katello
       end
     end
 
-    def self.find_by_purpose_addons(_key, operator, value)
-      conditions = sanitize_sql_for_conditions(["#{Katello::PurposeAddon.table_name}.name #{operator} ?", value_to_sql(operator, value)])
-      activation_keys = ::Katello::ActivationKey.joins(:purpose_addons).where(conditions)
-      return_activation_keys_by_id(activation_keys.pluck(:id))
-    end
-
     def validate_destroyable!
       if !organization.being_deleted? && Parameter.where(name: 'kt_activation_keys').pluck(:value).any? { |value| value.split(",").include?(name) }
         fail _("This activation key is associated to one or more Hosts/Hostgroups. "\
@@ -301,7 +290,7 @@ module Katello
       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

data/app/models/katello/authorization/flatpak_remote.rb

@@ -0,0 +1,33 @@
+module Katello
+  module Authorization::FlatpakRemote
+    extend ActiveSupport::Concern
+
+    include Authorizable
+
+    def readable?
+      authorized?(:view_flatpak_remotes)
+    end
+
+    def editable?
+      authorized?(:edit_flatpak_remotes)
+    end
+
+    def deletable?
+      authorized?(:destroy_flatpak_remotes)
+    end
+
+    module ClassMethods
+      def readable
+        authorized(:view_flatpak_remotes)
+      end
+
+      def editable
+        authorized(:edit_flatpak_remotes)
+      end
+
+      def deletable
+        authorized(:destroy_flatpak_remotes)
+      end
+    end
+  end
+end

data/app/models/katello/concerns/content_facet_host_extensions.rb

@@ -94,7 +94,8 @@ module Katello
           if state
             hosts = ::Host::Managed.joins(:content_facet).select(:id).where.not("#{::Katello::Host::ContentFacet.table_name}.bootc_booted_image" => nil)
           else
-            hosts = ::Host::Managed.joins(:content_facet).select(:id).where("#{::Katello::Host::ContentFacet.table_name}.bootc_booted_image" => nil)
+            # left_outer_joins will include hosts without a content facet. We assume such hosts are package-mode hosts.
+            hosts = ::Host::Managed.left_outer_joins(:content_facet).select(:id).where("#{::Katello::Host::ContentFacet.table_name}.bootc_booted_image" => nil)
           end
           { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.to_sql})" }
         end

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -89,7 +89,7 @@ module Katello
         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
 
@@ -98,6 +98,9 @@ module Katello
         has_many :content_views, through: :content_view_environments
         has_many :lifecycle_environments, through: :content_view_environments
 
+        has_one :docker_manifest, through: :content_facet, source: :manifest_entity, source_type: 'Katello::DockerManifest'
+        has_one :docker_manifest_list, through: :content_facet, source: :manifest_entity, source_type: 'Katello::DockerManifestList'
+
         has_many :host_installed_packages, :class_name => "::Katello::HostInstalledPackage", :foreign_key => :host_id, :dependent => :delete_all
         has_many :installed_packages, :class_name => "::Katello::InstalledPackage", :through => :host_installed_packages
 
@@ -586,8 +589,8 @@ module Katello
         end
       end
 
-      def advisory_ids(search:, check_installable_for_host: true)
-        errata_scope = check_installable_for_host ? ::Katello::Erratum.installable_for_hosts([self]) : ::Katello::Erratum
+      def advisory_ids(search:)
+        errata_scope = ::Katello::Erratum.installable_for_hosts([self])
         ids = errata_scope.search_for(search).pluck(:errata_id)
         if ids.empty?
           fail _("Cannot install errata: No errata found for search term '%s'") % search
@@ -620,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

data/app/models/katello/concerns/http_proxy_extensions.rb

@@ -84,6 +84,10 @@ module Katello
         uri.user = nil
         "#{name} (#{uri})"
       end
+
+      def content_default_http_proxy?
+        Setting[:content_default_http_proxy] == name
+      end
     end
   end
 end