katello 4.14.1 → 4.15.0.rc2

data/app/models/katello/activation_key.rb

@@ -7,11 +7,16 @@ module Katello
     include ForemanTasks::Concerns::ActionSubject
     include ScopedSearchExtensions
 
+    has_many :content_view_environment_activation_keys, :class_name => "Katello::ContentViewEnvironmentActivationKey",
+             :dependent => :destroy, :inverse_of => :activation_key
+    has_many :content_view_environments, :through => :content_view_environment_activation_keys,
+             :class_name => "Katello::ContentViewEnvironment", :source => :content_view_environment
+
+    has_many :content_views, :through => :content_view_environments, :class_name => "Katello::ContentView"
+    has_many :lifecycle_environments, :through => :content_view_environments, :class_name => "Katello::KTEnvironment"
+
     belongs_to :organization, :inverse_of => :activation_keys
-    belongs_to :environment, :class_name => "KTEnvironment", :inverse_of => :activation_keys
     belongs_to :user, :inverse_of => :activation_keys, :class_name => "::User"
-    belongs_to :content_view, :class_name => "Katello::ContentView", :inverse_of => :activation_keys
-
     has_many :key_host_collections, :class_name => "Katello::KeyHostCollection", :dependent => :destroy
     has_many :host_collections, :through => :key_host_collections
 
@@ -25,9 +30,6 @@ module Katello
     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
 
-    alias_method :lifecycle_environment, :environment
-
-    before_validation :set_default_content_view, :unless => :persisted?
     before_destroy :validate_destroyable!
     accepts_nested_attributes_for :purpose_addons
 
@@ -36,7 +38,6 @@ module Katello
     validates :name, :presence => true
     validates :name, :format => { without: /,/, message: _('cannot contain commas') }
     validates :name, :uniqueness => {:scope => :organization_id}
-    validate :environment_exists
     validates :max_hosts, :numericality => {:less_than => 2**31, :allow_nil => true}
     validates_each :max_hosts do |record, attr, value|
       if record.unlimited_hosts
@@ -54,15 +55,33 @@ module Katello
         end
       end
     end
-    validates_with Validators::ContentViewEnvironmentValidator
+    validates_with Katello::Validators::GeneratedContentViewValidator
+    validate :check_cves
 
-    scope :in_environment, ->(env) { where(:environment_id => env) }
+    scope :with_environments, ->(lifecycle_environments) do
+      joins(:content_view_environment_activation_keys => :content_view_environment).
+        where("#{::Katello::ContentViewEnvironment.table_name}.environment_id" => lifecycle_environments)
+    end
+
+    scope :with_content_views, ->(content_views) do
+      joins(:content_view_environment_activation_keys => :content_view_environment).
+        where("#{::Katello::ContentViewEnvironment.table_name}.content_view_id" => content_views)
+    end
+
+    scope :with_content_view_environments, ->(content_view_environments) do
+      joins(:content_view_environment_activation_keys => :content_view_environment).
+        where("#{::Katello::ContentViewEnvironment.table_name}.id" => content_view_environments)
+    end
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
-    scoped_search :rename => :environment, :on => :name, :relation => :environment, :complete_value => true
-    scoped_search :rename => :content_view, :on => :name, :relation => :content_view, :complete_value => true
-    scoped_search :on => :content_view_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+
+    scoped_search :relation => :content_views, :on => :name, :complete_value => true, :rename => :content_view, :only_explicit => true
+    scoped_search :relation => :content_views, :on => :id, :complete_value => true, :rename => :content_view_id, :only_explicit => true
+
+    scoped_search :relation => :lifecycle_environments, :on => :id, :complete_value => true, :rename => :lifecycle_environment_id, :only_explicit => true
+    scoped_search :relation => :lifecycle_environments, :on => :name, :complete_value => true, :rename => :environment, :only_explicit => true
+
     scoped_search :on => :description, :complete_value => true
     scoped_search :on => :name, :relation => :subscriptions, :rename => :subscription_name, :complete_value => true, :ext_method => :find_by_subscription_name
     scoped_search :on => :id, :relation => :subscriptions, :rename => :subscription_id, :complete_value => true,
@@ -71,14 +90,85 @@ module Katello
     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 environment_exists
-      if environment_id && environment.nil?
-        errors.add(:environment, _("ID: %s doesn't exist ") % environment_id)
-      elsif !environment.nil? && environment.organization != self.organization
-        errors.add(:environment, _("name: %s doesn't exist ") % environment.name)
+    def self.in_environments(envs)
+      with_environments(envs)
+    end
+
+    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.")
       end
+      super(new_cves)
+      Katello::ContentViewEnvironmentActivationKey.reprioritize_for_activation_key(self, new_cves)
+      self.content_view_environments.reload unless self.new_record?
     end
 
+    def multi_content_view_environment?
+      # returns false if there are no content view environments
+      content_view_environments.size > 1
+    end
+
+    def single_content_view_environment?
+      # also returns false if there are no content view environments
+      content_view_environments.size == 1
+    end
+
+    def single_content_view
+      if multi_content_view_environment?
+        Rails.logger.warn _("Activation key %s has more than one content view. Use #content_views instead.") % name
+      end
+      content_view_environments&.first&.content_view
+    end
+
+    def content_view
+      single_content_view
+    end
+
+    def environment
+      single_lifecycle_environment
+    end
+
+    def single_lifecycle_environment
+      if multi_content_view_environment?
+        Rails.logger.warn _("Activation key %s has more than one lifecycle environment. Use #lifecycle_environments instead.") % name
+      end
+      content_view_environments&.first&.lifecycle_environment
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    def assign_single_environment(
+      content_view_id: nil, lifecycle_environment_id: nil, environment_id: nil,
+      content_view: nil, lifecycle_environment: nil, environment: nil
+    )
+      lifecycle_environment_id ||= environment_id || lifecycle_environment&.id || environment&.id || self.single_lifecycle_environment&.id
+      content_view_id ||= content_view&.id || self.single_content_view&.id
+
+      unless lifecycle_environment_id
+        fail _("Lifecycle environment must be specified")
+      end
+
+      unless content_view_id
+        fail _("Content view must be specified")
+      end
+
+      content_view_environment = ::Katello::ContentViewEnvironment
+        .where(:content_view_id => content_view_id, :environment_id => lifecycle_environment_id)
+        .first_or_create do |cve|
+        Rails.logger.info("ContentViewEnvironment not found for content view '#{cve.content_view_name}' and environment '#{cve.environment&.name}'; creating a new one.")
+      end
+      fail _("Unable to create ContentViewEnvironment. Check the logs for more information.") if content_view_environment.nil?
+
+      if self.content_view_environments.include?(content_view_environment)
+        Rails.logger.info("Activation key '#{name}' already has the content view environment '#{content_view_environment.content_view_name}' and environment '#{content_view_environment.environment&.name}'.")
+      else
+        self.content_view_environments = [content_view_environment]
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
+
     def usage_count
       subscription_facet_activation_keys.count
     end
@@ -92,11 +182,15 @@ module Katello
     end
 
     def available_releases
-      if self.environment
-        self.environment.available_releases
-      else
-        self.organization.library.available_releases
+      releases = self.content_view_environments.flat_map do |cve|
+        cve.content_view.version(cve.lifecycle_environment).available_releases
       end
+      return self.organization.library.available_releases if releases.blank?
+      releases
+    end
+
+    def content_view_environment_labels
+      content_view_environments.map(&:label).join(',')
     end
 
     def available_subscriptions
@@ -133,8 +227,9 @@ module Katello
     def copy(new_name)
       new_key = ActivationKey.new
       new_key.name = new_name
-      new_key.attributes = self.attributes.slice("description", "environment_id", "organization_id", "content_view_id", "max_hosts", "unlimited_hosts")
+      new_key.attributes = self.attributes.slice("description", "organization_id", "max_hosts", "unlimited_hosts")
       new_key.host_collection_ids = self.host_collection_ids
+      new_key.content_view_environments = content_view_environments
       new_key
     end
 
@@ -190,12 +285,13 @@ module Katello
       true
     end
 
-    private
-
-    def set_default_content_view
-      if self.environment && self.content_view.nil?
-        self.content_view = self.environment.try(:default_content_view)
+    def check_cves
+      cves_not_in_org = self.content_view_environments.any? do |cve|
+        cve.content_view.organization != cve.environment.organization ||
+          self.organization != cve.content_view.organization
       end
+
+      errors.add(:base, _("Cannot add content view environments from a different organization")) if cves_not_in_org
     end
 
     apipie :class, desc: "A class representing #{model_name.human} object" do

data/app/models/katello/alternate_content_source.rb

@@ -40,25 +40,25 @@ module Katello
     # verify ssl must be validated this way due to presence: <bool> failing on a value of false
     validates :verify_ssl, if: -> { custom? || rhui? }, inclusion: {
       in: [true, false],
-      message: "must be provided for custom or rhui ACS"
+      message: "must be provided for custom or rhui ACS",
     }
     validates :verify_ssl, if: :simplified?, inclusion: {
       in: [nil],
-      message: "cannot be provided for simplified ACS"
+      message: "cannot be provided for simplified ACS",
     }
     validates :alternate_content_source_type, inclusion: {
       in: ->(_) { ACS_TYPES },
       allow_blank: false,
-      message: ->(_, _) { _("is not a valid type. Must be one of the following: %s") % ACS_TYPES.join(',') }
+      message: ->(_, _) { _("is not a valid type. Must be one of the following: %s") % ACS_TYPES.join(',') },
     }
     validates :content_type, inclusion: {
       in: ->(_) { RepositoryTypeManager.defined_repository_types.keys & CONTENT_TYPES },
       allow_blank: false,
-      message: ->(_, _) { _("is not allowed for ACS. Must be one of the following: %s") % (RepositoryTypeManager.defined_repository_types.keys & CONTENT_TYPES).sort.join(',') }
+      message: ->(_, _) { _("is not allowed for ACS. Must be one of the following: %s") % (RepositoryTypeManager.defined_repository_types.keys & CONTENT_TYPES).sort.join(',') },
     }
     validates :content_type, if: -> { rhui? }, inclusion: {
       in: [::Katello::Repository::YUM_TYPE],
-      message: "'%{value}' is not valid for RHUI ACS"
+      message: "'%{value}' is not valid for RHUI ACS",
     }
     validate :constraint_acs_update, on: :update
     validates_with Validators::AlternateContentSourcePathValidator, :attributes => [:base_url, :subpaths], :if => :custom?

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

@@ -34,7 +34,7 @@ module Katello
       end
 
       def all_editable?(content_view, environments)
-        key_query = ActivationKey.where(:content_view_id => content_view, :environment_id => environments)
+        key_query = ActivationKey.with_content_views(content_view).with_environments(environments)
         key_query.count == key_query.editable.count
       end
     end

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

@@ -5,5 +5,12 @@ module Katello
     def readable?
       self.content_view.readable? && self.environment.readable?
     end
+
+    module ClassMethods
+      def readable
+        where(:content_view_id => ::Katello::ContentView.readable,
+              :environment_id => ::Katello::KTEnvironment.readable)
+      end
+    end
   end
 end

data/app/models/katello/cdn_configuration.rb

@@ -19,7 +19,7 @@ module Katello
     validates :upstream_organization_label, presence: true, if: :network_sync?
 
     validates :url, presence: true, unless: :export_sync?
-    validates_with Validators::KatelloUrlFormatValidator, attributes: :url, unless: :export_sync?
+    validates_with Validators::KatelloURLFormatValidator, attributes: :url, unless: :export_sync?
     validates_with Validators::KatelloLabelFormatValidator, attributes: :upstream_organization_label, if: proc { upstream_organization_label.present? }
     validate :non_redhat_configuration, if: :network_sync?
 

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

@@ -8,13 +8,13 @@ module Katello
           :security_needed => Katello::ErrataStatus::NEEDED_SECURITY_ERRATA,
           :errata_needed => Katello::ErrataStatus::NEEDED_ERRATA,
           :updated => Katello::ErrataStatus::UP_TO_DATE,
-          :unknown => Katello::ErrataStatus::UNKNOWN
+          :unknown => Katello::ErrataStatus::UNKNOWN,
         }.freeze
 
         TRACE_STATUS_MAP = {
           :reboot_needed => Katello::TraceStatus::REQUIRE_REBOOT,
           :process_restart_needed => Katello::TraceStatus::REQUIRE_PROCESS_RESTART,
-          :updated => Katello::TraceStatus::UP_TO_DATE
+          :updated => Katello::TraceStatus::UP_TO_DATE,
         }.freeze
 
         has_one :errata_status_object, :class_name => 'Katello::ErrataStatus', :foreign_key => 'host_id', :dependent => :destroy
@@ -53,6 +53,17 @@ module Katello
         scoped_search :relation => :bound_root_repositories, :on => :name, :rename => :repository, :complete_value => true, :ext_method => :find_by_repository_name, :only_explicit => true
         scoped_search :relation => :bound_content, :on => :label, :rename => :repository_content_label, :complete_value => true, :ext_method => :find_by_repository_content_label, :only_explicit => true
 
+        scoped_search relation: :content_facet, on: :bootc_booted_image, complete_value: true, only_explicit: true
+        scoped_search relation: :content_facet, on: :bootc_booted_digest, complete_value: true, only_explicit: true
+        scoped_search relation: :content_facet, on: :bootc_available_image, complete_value: true, only_explicit: true
+        scoped_search relation: :content_facet, on: :bootc_available_digest, complete_value: true, only_explicit: true
+        scoped_search relation: :content_facet, on: :bootc_staged_image, complete_value: true, only_explicit: true
+        scoped_search relation: :content_facet, on: :bootc_staged_digest, complete_value: true, only_explicit: true
+        scoped_search relation: :content_facet, on: :bootc_rollback_image, complete_value: true, only_explicit: true
+        scoped_search relation: :content_facet, on: :bootc_rollback_digest, complete_value: true, only_explicit: true
+        scoped_search relation: :content_facet, on: :bootc_booted_image, rename: :image_mode, only_explicit: true, ext_method: :find_by_image_mode,
+                      operators: ['='], complete_value: { true: true, false: false}
+
         # preserve options set by facets framework, but add new :reject_if statement
         accepts_nested_attributes_for(
           :content_facet,
@@ -77,24 +88,27 @@ module Katello
       end
 
       module ClassMethods
-        def find_by_applicable_errata(_key, operator, value)
-          conditions = sanitize_sql_for_conditions(["#{Katello::Erratum.table_name}.errata_id #{operator} ?", value_to_sql(operator, value)])
-          hosts = ::Host::Managed.joins(:applicable_errata).where(conditions)
-          if hosts.empty?
-            { :conditions => "1=0" }
+        def find_by_image_mode(_key, _operator, value)
+          # operator is always '='
+          state = ::Foreman::Cast.to_bool(value)
+          if state
+            hosts = ::Host::Managed.joins(:content_facet).select(:id).where.not("#{::Katello::Host::ContentFacet.table_name}.bootc_booted_image" => nil)
           else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.pluck(:id).join(',')})" }
+            hosts = ::Host::Managed.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
+
+        def find_by_applicable_errata(_key, operator, value)
+          conditions = sanitize_sql_for_conditions(["#{Katello::Erratum.table_name}.errata_id #{operator} ?", value_to_sql(operator, value)])
+          hosts = ::Host::Managed.joins(:applicable_errata).select(:id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.to_sql})" }
         end
 
         def find_by_installable_errata(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Erratum.table_name}.errata_id #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_installable_errata.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_installable_errata.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_applicable_debs(_key, operator, value)
@@ -117,42 +131,26 @@ module Katello
 
         def find_by_applicable_rpms(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Rpm.table_name}.nvra #{operator} ?", value_to_sql(operator, value)])
-          hosts = ::Host::Managed.joins(:applicable_rpms).where(conditions)
-          if hosts.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.pluck(:id).join(',')})" }
-          end
+          hosts = ::Host::Managed.joins(:applicable_rpms).select(:id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.to_sql})" }
         end
 
         def find_by_installable_rpms(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Rpm.table_name}.nvra #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_installable_rpms.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_installable_rpms.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_repository_content_label(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Content.table_name}.label #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_repositories.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_repositories.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_repository_name(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::RootRepository.table_name}.name #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_repositories.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_repositories.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def in_content_view_environments(content_views: nil, lifecycle_environments: nil)

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, to: :content_facet, allow_nil: true
+          :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
 
@@ -128,6 +128,10 @@ module Katello
 
         scope :with_pools_expiring_in_days, ->(days) { joins(:pools).merge(Katello::Pool.expiring_in_days(days)).distinct }
 
+        scope :image_mode, -> do
+          joins(:content_facet).where.not("#{::Katello::Host::ContentFacet.table_name}.bootc_booted_image" => nil)
+        end
+
         scoped_search :relation => :host_collections, :on => :id, :complete_value => false, :rename => :host_collection_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
         scoped_search :relation => :host_collections, :on => :name, :complete_value => true, :rename => :host_collection
         scoped_search :relation => :installed_packages, :on => :nvra, :complete_value => true, :rename => :installed_package, :only_explicit => true
@@ -236,11 +240,11 @@ module Katello
           hosts = debs.joins(:host_installed_debs).select("#{Katello::HostInstalledDeb.table_name}.host_id as host_id").pluck(:host_id)
           if hosts.empty?
             {
-              :conditions => "1=0"
+              :conditions => "1=0",
             }
           else
             {
-              :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.join(',')})"
+              :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.join(',')})",
             }
           end
         end
@@ -339,7 +343,7 @@ module Katello
           {
             name: module_stream["name"],
             stream: module_stream["stream"],
-            context: module_stream["context"]
+            context: module_stream["context"],
           }
         end
         if streams.any?
@@ -382,7 +386,7 @@ module Katello
             host_id: self.id,
             available_module_stream_id: new_id,
             installed_profiles: module_stream["installed_profiles"],
-            status: status
+            status: status,
           }
         end
         HostAvailableModuleStream.insert_all(hams_to_create) if hams_to_create.any?
@@ -530,10 +534,16 @@ module Katello
           versions_by_name_arch = {}
           if versions.present?
             JSON.parse(versions).each do |nvra|
-              nvra =~ /([^.]*)-[-.\w]*\.(\w+)/
-              versions_by_name_arch[[Regexp.last_match(1), Regexp.last_match(2)]] = nvra
+              package_info = ::Katello::Util::Package.parse_nvrea(nvra)
+              versions_by_name_arch[[package_info[:name], package_info[:arch]]] = nvra
             end
           end
+
+          # > versions_by_name_arch
+          # =>
+          # {["glibc-langpack-en", "x86_64"]=>"glibc-langpack-en-2.34-100.el9_4.2.x86_64",
+          #  ["crypto-policies", "noarch"]=>"crypto-policies-20221215-1.git9a18988.el9_2.1.noarch"}
+
           pkg_name_archs = installed_packages.search_for(search).distinct.pluck(:name, :arch)
           if pkg_name_archs.empty?
             fail _("Cannot upgrade packages: No installed packages found for search term '%s'.") % search
@@ -610,7 +620,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
+        :single_content_view, :single_lifecycle_environment, :release_version,
+        :purpose_role, :purpose_usage
 end
 
 class ActiveRecord::Associations::CollectionProxy::Jail < Safemode::Jail

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

@@ -33,7 +33,7 @@ module Katello
         has_many :product_contents, :through => :products
         has_many :repositories, :through => :products
         has_one :cdn_configuration, :class_name => "Katello::CdnConfiguration", :dependent => :destroy, :inverse_of => :organization
-
+        has_many :flatpak_remotes, :class_name => "Katello::FlatpakRemote", :dependent => :destroy, :inverse_of => :organization
         #older association
         has_many :org_tasks, :dependent => :destroy, :class_name => "Katello::TaskStatus", :inverse_of => :organization
 
@@ -201,7 +201,7 @@ module Katello
           defaults = {
             :message => _("Informable Type must be one of the following [ %{list} ]") %
                 { :list => ALLOWED_DEFAULT_INFO_TYPES.join(", ") },
-            :error => RuntimeError
+            :error => RuntimeError,
           }
           options = defaults.merge(options)
 
@@ -214,9 +214,9 @@ module Katello
           products.any?(&:syncable_content?)
         end
 
-        def enabled_product_content_for(roots)
+        def enabled_product_content_for(content_ids)
           Katello::ProductContent.joins(:content).where(:product_id => self.products.enabled,
-                             "#{::Katello::Content.table_name}.cp_content_id" => roots.select(:content_id))
+                             "#{::Katello::Content.table_name}.cp_content_id" => content_ids)
         end
 
         def enabled_product_content

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

@@ -32,7 +32,7 @@ module Katello
             'name' => name,
             'major' => major.to_s,
             'minor' => minor.to_s,
-            'family' => 'Redhat'
+            'family' => 'Redhat',
           }
 
           return ::Redhat.create!(params)