katello 4.7.5 → 4.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd4bf2aa04a425ae9878634d31f53214b3ea3f0143df8d085621bfc558cadd77
-  data.tar.gz: 84916e97ceb9cecdd2fedd5683294e238c66f1698d74583e31378d93df1cf94c
+  metadata.gz: 8a0a050c517227f7841e9242a1a02bd8d035844684abb8ad25c61e42c3e16a5a
+  data.tar.gz: a6951453dcec4f9ae1fd49622c94d22dce1573a6e788697ec117146e412c61c2
 SHA512:
-  metadata.gz: 3bd2c0ab5a699d02aeed2c6c614db181e0270c3f05f80273d1bd19d6ac1c279151fe5cee92493a146d4a18c97f3d40b11a85c83b80f048abba51632b7e67060a
-  data.tar.gz: 352f528834b0ed0a45066b689064baac6a2195b6f33b006b80459b11c781ed01fd8d59bf9f5914bc618eaea5263d613f6bc6aaacfcadc3549997bd72739ff73f
+  metadata.gz: 5041a03d75d5a6cf5fc38aaf2d9a43a05123dbc7065f5dccdf9bd67f40f50483c67ed274d687ab7bafe8ccc8e918afa46406bbed21c0482552e964a6155bc126
+  data.tar.gz: 1a622363fcd90b70cd167ae71bb741a8de5e6ef4128a957c476ce90947289cf47d8374560e3e8088dea1aeaaab5f28875707f1a60a50eefc6f4485f4011fc52c

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -161,7 +161,7 @@ module Katello
         returns String, desc: 'Package version'
       end
       def host_latest_applicable_rpm_version(host, package)
-        ::Katello::Rpm.latest(host.applicable_rpms.where(name: package)).first.nvra
+        ::Katello::Rpm.latest(host.applicable_rpms.where(name: package))&.first&.nvra
       end
 
       apipie :method, 'Loads Pool objects' do

data/app/lib/katello/util/content_overrides_migrator.rb

@@ -12,11 +12,11 @@ module Katello
         ak_errors = create_disabled_overrides_for_non_sca_org_activation_keys(organization: @organization)
 
         total_errors = host_errors + ak_errors
-        finish_message = "Finished creating overrides in non-SCA orgs; #{total_errors == 0 ? "no errors" : "#{pluralize(total_errors, "error")}"}"
+        finish_message = "Finished creating overrides in non-SCA org; #{total_errors == 0 ? "no errors" : "#{pluralize(total_errors, "error")}"}"
         messages = { result: finish_message, errors: total_errors }
         messages[:host_errors] = "Hosts - #{pluralize(host_errors, "error")} creating disabled overrides for unsubscribed content; see log messages above" if host_errors > 0
         messages[:ak_errors] = "Activation keys - #{pluralize(ak_errors, "error")} creating disabled overrides for unsubscribed content; see log messages above" if ak_errors > 0
-        messages[:success_message] = "You may now switch all organizations to Simple Content Access mode without any change in access to content." if total_errors == 0
+        messages[:success_message] = "Organization may now be switched to Simple Content Access mode without any change in access to content." if total_errors == 0
         Rails.logger.info finish_message
         Rails.logger.info messages[:host_errors] if messages[:host_errors]
         Rails.logger.info messages[:ak_errors] if messages[:ak_errors]

data/app/models/katello/product_content.rb

@@ -15,6 +15,10 @@ module Katello
       where(:product_id => Product.redhat.select(:id))
     }
 
+    scope :custom, -> {
+      where.not(:product_id => Product.redhat.select(:id))
+    }
+
     scoped_search :on => :name, :relation => :content
     scoped_search :relation => :product, :on => :name, :rename => :product
     scoped_search :on => :content_type, :relation => :content, :complete_value => true

data/app/services/katello/product_content_finder.rb

@@ -30,6 +30,10 @@ module Katello
       consumable.organization.enabled_product_content_for(roots)
     end
 
+    def custom_content_labels
+      product_content.custom.map { |pc| pc.product.root_repositories.map(&:custom_content_label) }.flatten.uniq
+    end
+
     def self.wrap_with_overrides(product_contents:, overrides:, status: nil)
       pc_with_overrides = product_contents.map { |pc| ProductContentPresenter.new(pc, overrides) }
       if status

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.7.5".freeze
+  VERSION = "4.7.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.7.5
+  version: 4.7.6
 platform: ruby
 authors:
 - N/A
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -4491,31 +4497,54 @@ files:
 - locale/Makefile
 - locale/README
 - locale/action_names.rb
+- locale/bn/LC_MESSAGES/katello.mo
 - locale/bn/katello.po
+- locale/cs/LC_MESSAGES/katello.mo
 - locale/cs/katello.po
+- locale/de/LC_MESSAGES/katello.mo
 - locale/de/katello.po
+- locale/en/LC_MESSAGES/katello.mo
 - locale/en/katello.po
+- locale/es/LC_MESSAGES/katello.mo
 - locale/es/katello.po
+- locale/fr/LC_MESSAGES/katello.mo
 - locale/fr/katello.po
+- locale/gu/LC_MESSAGES/katello.mo
 - locale/gu/katello.po
+- locale/hi/LC_MESSAGES/katello.mo
 - locale/hi/katello.po
+- locale/it/LC_MESSAGES/katello.mo
 - locale/it/katello.po
+- locale/ja/LC_MESSAGES/katello.mo
 - locale/ja/katello.po
+- locale/ka/LC_MESSAGES/katello.mo
 - locale/ka/katello.po
 - locale/katello.pot
+- locale/kn/LC_MESSAGES/katello.mo
 - locale/kn/katello.po
+- locale/ko/LC_MESSAGES/katello.mo
 - locale/ko/katello.po
+- locale/mr/LC_MESSAGES/katello.mo
 - locale/mr/katello.po
+- locale/or/LC_MESSAGES/katello.mo
 - locale/or/katello.po
+- locale/pa/LC_MESSAGES/katello.mo
 - locale/pa/katello.po
+- locale/pt/LC_MESSAGES/katello.mo
 - locale/pt/katello.po
+- locale/pt_BR/LC_MESSAGES/katello.mo
 - locale/pt_BR/katello.po
+- locale/ru/LC_MESSAGES/katello.mo
 - locale/ru/katello.po
+- locale/ta/LC_MESSAGES/katello.mo
 - locale/ta/katello.po
+- locale/te/LC_MESSAGES/katello.mo
 - locale/te/katello.po
 - locale/update-i18n
 - locale/zanata.xml
+- locale/zh_CN/LC_MESSAGES/katello.mo
 - locale/zh_CN/katello.po
+- locale/zh_TW/LC_MESSAGES/katello.mo
 - locale/zh_TW/katello.po
 - package.json
 - vendor/assets/images/katello/add2.png
@@ -5429,7 +5458,7 @@ homepage: http://www.katello.org
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -5444,8 +5473,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman
 test_files: []