katello 3.8.0.rc3 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1e8d4def57738f812e6e9463c3a80a0ef587333
-  data.tar.gz: b2150d3ceeafdbd2b34ec05c8d85b69597183f10
+  metadata.gz: 47586318c412278d01e596abf029eb1ac5daf00c
+  data.tar.gz: c6b70b2b09c74778a46cd0e9956bf1dea2026e7b
 SHA512:
-  metadata.gz: 560eabd60a83230da3567573dfa0be73d488d92e47e5c4a1124356f1f0b54a9b82614fae8a8c3d6fa86a589779d8db6d4bc6109ef1bd5e318e7fa54ac51ca2a4
-  data.tar.gz: 4aa5dfd8a7d86cb8e402685d1e1da7da3a03e32baa30ae1f991eccb524f127f623a1b053357f5bb09d0a24f7e82b81f167269519cc8102cc111c5d3194eb97db
+  metadata.gz: e34da099dcbe80e6719c48e0aaca5384612b1b12c4aa629f1a573ba1608e36a1526f215b154dcacebcb01bc4fec32bc266ea3017b771025e0a7dedbf6949f438
+  data.tar.gz: b5a4629b88bb63be9fc35de61179d7db463b7dc5ee7d3c8c6b6f8a9bc0afe071c6529894612f3a3ecf338e28c3ea3da6d7e0484d66a79fff0d1566f920ddd445

data/app/controllers/katello/api/v2/host_packages_controller.rb

@@ -102,13 +102,9 @@ module Katello
       @host = resource_finder(::Host::Managed.authorized(:view_hosts, ::Host::Managed), params[:host_id])
     end
 
-    def valid_package_name?(package_name)
-      package_name =~ /^[a-zA-Z0-9\-\.\_\+\,]+$/
-    end
-
     def validate_package_list_format(packages)
       packages.each do |package|
-        if !valid_package_name?(package) && !package.is_a?(Hash)
+        unless package.is_a?(String) && ::Katello::Util::Package.valid_package_name_format(package).nil?
           fail HttpErrors::BadRequest, _("%s is not a valid package name") % package
         end
       end

data/app/lib/actions/pulp/consumer/abstract_content_action.rb

@@ -44,6 +44,18 @@ module Actions
           messages
         end
 
+        # by default runcible puts whatever we pass into a hash under the 'name' key
+        # here we can make the unit hash more precise
+        def parse_units_for_type
+          if input[:type] == 'rpm'
+            input[:args].collect do |unit|
+              ::Katello::Util::Package.parse_nvrea_nvre(unit) || unit
+            end
+          else
+            input[:args]
+          end
+        end
+
         def presenter
           Consumer::ContentPresenter.new(self)
         end

data/app/lib/actions/pulp/consumer/content_install.rb

@@ -14,7 +14,7 @@ module Actions
         def invoke_external_task
           task = pulp_extensions.consumer.install_content(input[:consumer_uuid],
                                                    input[:type],
-                                                   input[:args],
+                                                   parse_units_for_type,
                                                     "importkeys" => true)
           schedule_timeout(Setting['content_action_accept_timeout'])
           task

data/app/lib/actions/pulp/consumer/content_uninstall.rb

@@ -14,7 +14,7 @@ module Actions
         def invoke_external_task
           pulp_extensions.consumer.uninstall_content(input[:consumer_uuid],
                                                      input[:type],
-                                                     input[:args])
+                                                     parse_units_for_type)
         end
 
         def presenter

data/app/lib/actions/pulp/consumer/content_update.rb

@@ -17,7 +17,7 @@ module Actions
 
           pulp_extensions.consumer.update_content(input[:consumer_uuid],
                                                   input[:type],
-                                                  input[:args],
+                                                  parse_units_for_type,
                                                   options)
         end
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js

@@ -28,14 +28,15 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkRepositorySe
         nutupaneParams = {
             'organization_id': CurrentOrganization,
             'offset': 0,
-            'sort_by': 'name',
-            'sort_order': 'ASC',
             'paged': true
         };
 
-        nutupane = new Nutupane(RepositorySet, nutupaneParams, 'queryPaged');
+        nutupane = new Nutupane(RepositorySet, nutupaneParams,
+          'queryPaged', {disableAutoLoad: true});
         $scope.controllerName = 'katello_repository_sets';
         nutupane.masterOnly = true;
+        nutupane.setSearchKey('repoSetsSearch');
+        nutupane.load();
 
         $scope.table = nutupane.table;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js

@@ -18,7 +18,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesInstalled
         var packagesNutupane;
 
         $scope.removeSelectedPackages = function () {
-            var selected = $scope.table.getSelected();
+            var selected = _.map($scope.table.getSelected(), 'name');
 
             if (!$scope.working) {
                 $scope.working = true;

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.8.0.rc3
+  version: 3.8.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2501,9 +2501,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.1