katello 3.16.0.rc2.1 → 3.16.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07abcc2d0e780bd3bfee4cd44b73ef4183e0a50daebe6a32cd056e162e3fde52
-  data.tar.gz: 6c95fe44a013f6e74d36098c3e96f8e669f5670925620a9dc26e6ed674cc2abb
+  metadata.gz: 04f2764c53787c361c263472071b3b7cedcda99968c243aff92e1926496a22eb
+  data.tar.gz: 80fc78542e71113498942a3140fbb9849fc125fbfc238fff286f91f2cf847995
 SHA512:
-  metadata.gz: 17dece7796e9c33d88970ed5eaba5d810db5b84c76ddc03d0767c8bf426013ac9c3e29f14a3bb3be6663e0233e8968551294f51000fb4161e348028add9ecb0b
-  data.tar.gz: c8b139917779fb48e642270141eb4418c4f668433307cb8097661b581985edc7163f67524328f13368c5cf80d7fc51ef2c856816eacb19ff9a720f40cef595d8
+  metadata.gz: 4fc2fd3c56d2358234aa3465ff162cfc8101cca2ca8c7547b4144ef4baf088fbb39135dbde488cb3a26b7f19a838756772615561c72112ad2c75db52ec984bbf
+  data.tar.gz: 11d16330661cce5539773defa022d2a362367c072f610f975c6315387e72cec20fb71757cf9ec49f261e827f9d28ed0fa126f5c291223568a6e05da1a493153b

data/app/models/katello/rhsm_fact_parser.rb

@@ -61,6 +61,10 @@ module Katello
           os_attributes[:release_name] = release_name
         end
 
+        if facts['distribution.name'] == 'Red Hat Enterprise Linux Workstation'
+          os_attributes[:name] = os_name + '_Workstation'
+        end
+
         ::Operatingsystem.find_by(os_attributes) || ::Operatingsystem.create!(os_attributes)
       end
     end

data/db/migrate/20200526200422_encrypt_root_repository_upstream_password.rb

@@ -36,10 +36,12 @@ class EncryptRootRepositoryUpstreamPassword < ActiveRecord::Migration[6.0]
   end
 
   def up
+    change_column :katello_root_repositories, :upstream_password, :text
     modify_root_repository_upstream_password(:encrypt)
   end
 
   def down
     modify_root_repository_upstream_password(:decrypt)
+    change_column :katello_root_repositories, :upstream_password, :string
   end
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html

@@ -75,7 +75,7 @@
         <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="productRepoSet in table.rows | filter:repositorySetFilter" row-select="productRepoSet">
           <td bst-table-cell>{{ productRepoSet.content.name }}</td>
           <td bst-table-cell>
-            <a ui-sref="product.info({productId: id})">
+            <a ui-sref="product.info({productId: productRepoSet.product.id})">
               {{ productRepoSet.product.name }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version.factory.js

@@ -9,10 +9,10 @@
  *   Provides a BastionResource for interacting with Content View Versions.
  */
 angular.module('Bastion.content-views.versions').factory('ContentViewVersion',
-    ['BastionResource', function (BastionResource) {
+    ['BastionResource', 'CurrentOrganization', function (BastionResource, CurrentOrganization) {
 
         return BastionResource('katello/api/v2/content_view_versions/:id/:action',
-            {id: '@id'},
+            {id: '@id', 'organization_id': CurrentOrganization},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
                 update: {method: 'PUT'},

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.16.0.rc2.1".freeze
+  VERSION = "3.16.0.rc3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.16.0.rc2.1
+  version: 3.16.0.rc3
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4871,7 +4871,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman