katello 3.5.0.rc1 → 3.5.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-products.controller.js

@@ -10,18 +10,16 @@
  * @requires Product
  * @requires CurrentOrganization
  * @requires Nutupane
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the sync plan list products details action pane.
  */
 angular.module('Bastion.sync-plans').controller('SyncPlanProductsController',
-    ['$scope', '$q', '$location', 'translate', 'SyncPlan', 'Product', 'CurrentOrganization', 'Nutupane',
-        function ($scope, $q, $location, translate, SyncPlan, Product, CurrentOrganization, Nutupane) {
+    ['$scope', '$q', '$location', 'translate', 'SyncPlan', 'Product', 'CurrentOrganization', 'Nutupane', 'Notification',
+        function ($scope, $q, $location, translate, SyncPlan, Product, CurrentOrganization, Nutupane, Notification) {
             var productsNutupane, params;
 
-            $scope.successMessages = [];
-            $scope.errorMessages = [];
-
             $scope.table = {};
 
             params = {
@@ -49,8 +47,8 @@ angular.module('Bastion.sync-plans').controller('SyncPlanProductsController',
                 };
 
                 success = function (response) {
-                    $scope.successMessages = [translate('Removed %x products from sync plan "%y".')
-                        .replace('%x', $scope.table.numSelected).replace('%y', $scope.syncPlan.name)];
+                    Notification.setSuccessMessage(translate('Removed %x products from sync plan "%y".')
+                        .replace('%x', $scope.table.numSelected).replace('%y', $scope.syncPlan.name));
                     $scope.table.working = false;
                     $scope.table.selectAll(false);
                     productsNutupane.refresh();
@@ -60,7 +58,9 @@ angular.module('Bastion.sync-plans').controller('SyncPlanProductsController',
 
                 error = function (response) {
                     deferred.reject(response.data.errors);
-                    $scope.errorMessages = response.data.errors;
+                    angular.forEach(response.data.errors, function (responseError) {
+                        Notification.setErrorMessage(responseError);
+                    });
                     $scope.table.working = false;
                 };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html

@@ -1,7 +1,5 @@
 <span page-title ng-model="syncPlan">{{ 'Sync Plan:' | translate }} {{ syncPlan.name }}</span>
 
-<div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
 <div class="row">
   <div class="col-sm-6">
     <h4 translate>Basic Information</h4>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-products.html

@@ -1,7 +1,5 @@
 <span page-title ng-model="syncPlan">{{ 'Product Management for Sync Plan:' | translate }} {{ syncPlan.name }}</span>
 
-<div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
 <nav>
   <ul class="nav nav-tabs nav-tabs-pf">
     <li ng-class="{active: isState('sync-plan.products.list')}">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/new-sync-plan.controller.js

@@ -6,14 +6,14 @@
  * @requires translate
  * @requires SyncPlan
  * @requires SyncPlanHelper
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Controls the creation of an empty SyncPlan object for use by sub-controllers.
  */
 angular.module('Bastion.sync-plans').controller('NewSyncPlanController',
-    ['$scope', '$rootScope', 'translate', 'SyncPlan', 'SyncPlanHelper', 'GlobalNotification',
-        function ($scope, $rootScope, translate, SyncPlan, SyncPlanHelper, GlobalNotification) {
+    ['$scope', '$rootScope', 'translate', 'SyncPlan', 'SyncPlanHelper', 'Notification',
+        function ($scope, $rootScope, translate, SyncPlan, SyncPlanHelper, Notification) {
             $scope.intervals = SyncPlanHelper.getIntervals();
 
             $scope.syncPlan = new SyncPlan();
@@ -22,7 +22,7 @@ angular.module('Bastion.sync-plans').controller('NewSyncPlanController',
             function success(syncPlan) {
                 $scope.working = false;
                 $scope.$state.go('sync-plan.info', {syncPlanId: syncPlan.id});
-                GlobalNotification.setSuccessMessage(translate('New sync plan successfully created.'));
+                Notification.setSuccessMessage(translate('New sync plan successfully created.'));
             }
 
             function error(response) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plan.factory.js

@@ -12,7 +12,7 @@ angular.module('Bastion.sync-plans').factory('SyncPlan',
     ['BastionResource', 'CurrentOrganization',
     function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/organizations/:organizationId/sync_plans/:id/:action',
+        return BastionResource('katello/api/v2/organizations/:organizationId/sync_plans/:id/:action',
             {id: '@id', organizationId: CurrentOrganization}, {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
                 update: { method: 'PUT' },

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/task.factory.js

@@ -24,10 +24,10 @@ angular.module('Bastion.tasks').factory('Task',
         var bulkSearchRunning = false, searchIdGenerator = 0,
             searchParamsById = {}, callbackById = {}, pollCount = 0, maxPollInterval = 10000;
 
-        var resource = BastionResource('/katello/api/v2/tasks/:id/:action',
+        var resource = BastionResource('katello/api/v2/tasks/:id/:action',
             {id: '@id', 'organization_id': CurrentOrganization}, {});
 
-        var foremanTasksResource = BastionResource('/foreman_tasks/api/tasks/:id/:action',
+        var foremanTasksResource = BastionResource('foreman_tasks/api/tasks/:id/:action',
             {},
             {
                 bulkSearch: {method: 'POST', isArray: true, params: { action: 'bulk_search'}}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks.module.js

@@ -28,19 +28,19 @@ angular.module('Bastion.tasks').config(['$stateProvider', function ($stateProvid
         templateUrl: 'tasks/views/tasks.html'
     })
     .state('tasks.index', {
-        url: '/katello_tasks',
+        url: 'katello_tasks',
         permission: 'view_tasks',
         templateUrl: 'tasks/views/tasks-index.html'
     })
     .state('tasks.details', {
-        url: '/katello_tasks/:taskId',
+        url: 'katello_tasks/:taskId',
         permission: 'view_tasks',
         collapsed: true,
         controller: 'TaskDetailsController',
         templateUrl: 'tasks/views/task-details-standalone.html'
     })
     .state('task', {
-        url: '/katello_tasks/single/:taskId',
+        url: 'katello_tasks/single/:taskId',
         controller: 'TaskDetailsController',
         permission: 'view_tasks',
         templateUrl: 'tasks/views/task-details-standalone.html'

data/lib/katello/permission_creator.rb

@@ -47,14 +47,15 @@ module Katello
     def capsule_content_permissions
       @plugin.permission :manage_capsule_content,
                          {
-                           'katello/api/v2/capsule_content' => [:lifecycle_environments, :available_lifecycle_environments, :add_lifecycle_environment, :remove_lifecycle_environment,
-                                                                :sync, :sync_status, :cancel_sync],
+                           'katello/api/v2/capsule_content' => [:add_lifecycle_environment, :remove_lifecycle_environment,
+                                                                :sync, :cancel_sync],
                            'katello/api/v2/capsules' => [:index, :show]
                          },
                          :resource_type => 'SmartProxy'
 
       @plugin.permission :view_capsule_content,
                          {
+                           'katello/api/v2/capsule_content' => [:lifecycle_environments, :available_lifecycle_environments, :sync_status],
                            'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content]
                          },
                          :resource_type => "SmartProxy"

data/lib/katello/permissions/host_permissions.rb

@@ -24,6 +24,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/auto_attach',
   'katello/api/v2/hosts_bulk_actions/content_overrides',
   'katello/api/v2/hosts_bulk_actions/environment_content_view',
+  'katello/api/v2/hosts_bulk_actions/release_version',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_proxies/regenerate_identity_certificates',
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',

data/lib/katello/permissions/organization_permissions.rb

@@ -5,6 +5,7 @@ Foreman::AccessControl.permission(:view_organizations).actions.concat [
   'katello/api/v2/organizations/show',
   'katello/api/v2/organizations/redhat_provider',
   'katello/api/v2/organizations/download_debug_certificate',
+  'katello/api/v2/organizations/releases',
   'katello/api/v2/tasks/index'
 ]
 

data/lib/katello/tasks/clean_installed_packages.rake

@@ -7,6 +7,8 @@ namespace :katello do
     cache = PackageCache.new
     cache.populate
 
+    puts "Cleaning katello_host_installed_packages table.."
+    cleaning_start = Time.now
     total = ::Host.count
     count = 1
     ::Host.find_each do |host|
@@ -23,17 +25,32 @@ namespace :katello do
       count += 1
     end
 
+    cleaning_total = sprintf('%.2f', Time.now - cleaning_start)
+    puts "katello_host_installed_packages table has been cleaned, total time was #{cleaning_total} seconds."
+    puts "Removing records from katello_installed_packages that are no longer referenced..."
+    cleaning_start = Time.now
+
     existing = Katello::HostInstalledPackage.select(:installed_package_id).uniq.pluck(:installed_package_id)
 
     batch = 20_000
     until Katello::InstalledPackage.where('id not in (?)', existing).limit(1).count == 0
-      deleted = Katello::InstalledPackage.where('id not in (?)', existing).where("id < #{batch}").delete_all
-      sleep(3) if deleted > 0
-      puts "Batch of installed packages deleted, #{Katello::InstalledPackage.count} remaining in total"
+      begin
+        deleted = Katello::InstalledPackage.where('id not in (?)', existing).where("id < #{batch}").delete_all
+        sleep(3) if deleted > 0
+        puts "Inspected #{batch} records in katello_host_installed_packages to remove unreferenced entries in katello_installed_packages.."
+      rescue ActiveRecord::InvalidForeignKey
+        puts "Some records in batch #{batch} were unable to be removed. This is usually due to system registrations or updates that occurred after the script started."
+        puts "The script will now exit. Usually, simply re-running the script is sufficient to work through this issue."
+        raise
+      end
       batch += 20_000
     end
+    cleaning_total = sprintf('%.2f', Time.now - cleaning_start)
+    puts "katello_installed_packages table has been cleaned to remove unreferenced entries, total time was #{cleaning_total} seconds."
 
+    puts "Script is complete, setting installed package search to updated method. To disable this, set 'bulk query installed packages' to 'false' in Katello settings."
     Setting[:bulk_query_installed_packages] = true
+    puts "Done!"
   end
 
   class PackageCache

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.5.0.rc1".freeze
+  VERSION = "3.5.0.rc2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.5.0.rc1
+  version: 3.5.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -210,20 +210,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -636,6 +636,7 @@ files:
 - app/lib/actions/katello/host/update.rb
 - app/lib/actions/katello/host/update_content_overrides.rb
 - app/lib/actions/katello/host/update_content_view.rb
+- app/lib/actions/katello/host/update_release_version.rb
 - app/lib/actions/katello/host/upload_package_profile.rb
 - app/lib/actions/katello/organization/auto_attach_subscriptions.rb
 - app/lib/actions/katello/organization/create.rb
@@ -678,6 +679,7 @@ files:
 - app/lib/actions/katello/repository/metadata_generate.rb
 - app/lib/actions/katello/repository/refresh_repository.rb
 - app/lib/actions/katello/repository/remove_content.rb
+- app/lib/actions/katello/repository/scheduled_sync.rb
 - app/lib/actions/katello/repository/sync.rb
 - app/lib/actions/katello/repository/update.rb
 - app/lib/actions/katello/repository/upload_errata.rb
@@ -694,6 +696,7 @@ files:
 - app/lib/actions/middleware/candlepin_services_check.rb
 - app/lib/actions/middleware/execute_if_contents_changed.rb
 - app/lib/actions/middleware/keep_locale.rb
+- app/lib/actions/middleware/keep_session_id.rb
 - app/lib/actions/middleware/propagate_candlepin_errors.rb
 - app/lib/actions/middleware/pulp_services_check.rb
 - app/lib/actions/middleware/record_fixtures.rb
@@ -803,6 +806,7 @@ files:
 - app/lib/katello/validators/content_view_filter_version_validator.rb
 - app/lib/katello/validators/content_view_puppet_module_validator.rb
 - app/lib/katello/validators/gpg_key_content_validator.rb
+- app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb
 - app/lib/katello/validators/katello_label_format_validator.rb
 - app/lib/katello/validators/katello_name_format_validator.rb
 - app/lib/katello/validators/katello_url_format_validator.rb
@@ -838,6 +842,7 @@ files:
 - app/models/katello/capsule_lifecycle_environment.rb
 - app/models/katello/concerns/container_extensions.rb
 - app/models/katello/concerns/content_facet_host_extensions.rb
+- app/models/katello/concerns/content_view_filter_rule_common.rb
 - app/models/katello/concerns/docker_container_wizard_state_extensions.rb
 - app/models/katello/concerns/environment_extensions.rb
 - app/models/katello/concerns/host_managed_extensions.rb
@@ -969,6 +974,7 @@ files:
 - app/services/katello/candlepin/consumer.rb
 - app/services/katello/candlepin/message_handler.rb
 - app/services/katello/event_queue.rb
+- app/services/katello/product_content_finder.rb
 - app/services/katello/proxy_status/pulp.rb
 - app/services/katello/proxy_status/pulp_node.rb
 - app/services/katello/pulp/consumer.rb
@@ -1014,6 +1020,7 @@ files:
 - app/views/foreman_docker/containers/steps/_katello_container.html.erb
 - app/views/katello/api/v2/activation_keys/available_host_collections.json.rabl
 - app/views/katello/api/v2/activation_keys/available_releases.json.rabl
+- app/views/katello/api/v2/activation_keys/base.json.rabl
 - app/views/katello/api/v2/activation_keys/index.json.rabl
 - app/views/katello/api/v2/activation_keys/product_content.json.rabl
 - app/views/katello/api/v2/activation_keys/show.json.rabl
@@ -1031,6 +1038,7 @@ files:
 - app/views/katello/api/v2/common/create.json.rabl
 - app/views/katello/api/v2/common/destroy.json.rabl
 - app/views/katello/api/v2/common/index.json.rabl
+- app/views/katello/api/v2/common/releases.json.rabl
 - app/views/katello/api/v2/common/status.json.rabl
 - app/views/katello/api/v2/common/update.json.rabl
 - app/views/katello/api/v2/content_facet/base.json.rabl
@@ -1409,6 +1417,7 @@ files:
 - db/migrate/20170821170915_add_index_to_installed_packages.rb
 - db/migrate/20170821170916_add_nvra_index_to_installed_packages.rb
 - db/migrate/20170913183848_add_errata_counts.rb
+- db/migrate/20171010170443_add_index_to_katello_content_facet_errata.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1466,6 +1475,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-host-collections-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-release-version-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html
@@ -1473,6 +1483,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-host-collections-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/errata-content-hosts.html