katello 3.9.0.rc1 → 3.9.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae72ca66136fbca345cde1526c87cda188886924
-  data.tar.gz: '018374e21b0767a004eb0a29d3a257b8f34c7b65'
+  metadata.gz: f6b967f06b8ebbd4d5c372ac7050103056ef3ce7
+  data.tar.gz: 200524bd0eeb8414e2fde6f9b83a25a5a3e2a132
 SHA512:
-  metadata.gz: 365920a445e5c8559ccb8e4a8d03bd22d18d6aeab5c37cf89251d9e3f660a37eeb8fb9e6070d83978cd8d0f2f470a32c48df735c14c5ce248e6075c5d492ba23
-  data.tar.gz: 6d6c00d08aba4e7f9e2405e28ccd7feab44f81af1d393eec683d63667c04914367bc81fc6c787b45b2656665a223a5648d995dd355f400bcac9c8b3e1a4f736b
+  metadata.gz: ca4ef8d5bb1adb3fed0aea35a251bc421aef8c79a85b0dcdef212baf2ecbdd0301c7dbfa0edb166978fb637e3fbfd7e15ccb5648b753c056be970494b32c4a73
+  data.tar.gz: 519c7b6e9f4817efa2e8fedebdc6e6117228a15f3cdf196e3904458938c1fdc845535aa3a00ab70aec4e8bf242bd87840f7e5bd7b664b40a33ab7c1a11c66e87

data/app/lib/katello/validators/root_repository_unique_attribute_validator.rb

@@ -2,7 +2,7 @@ module Katello
   module Validators
     class RootRepositoryUniqueAttributeValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
-        exists = RootRepository.where(attribute => value).where("id != ?", record.id || -1).exists?
+        exists = RootRepository.where(:product_id => record.product_id, attribute => value).where("id != ?", record.id || -1).exists?
 
         if record.send("#{attribute}_changed?") && record.custom? && exists
           record.errors[attribute] << _("has already been taken for this product.")

data/app/models/setting/content.rb

@@ -13,25 +13,46 @@ class Setting::Content < Setting
     self.transaction do
       [
         self.set('katello_default_provision', N_("Default provisioning template for Operating Systems created from synced content"),
-                 'Kickstart default', N_('Default synced OS provisioning template')),
-        self.set('katello_default_finish', N_("Default finish template for new Operating Systems created from synced content"),
-                 'Kickstart default finish', N_('Default synced OS finish template')),
+                 'Kickstart default', N_('Default synced OS provisioning template'),
+                 nil, :collection => proc { katello_template_setting_values("provision") }
+                ),
+        self.set('katello_default_finish',
+                 N_("Default finish template for new Operating Systems created from synced content"),
+                 'Kickstart default finish', N_('Default synced OS finish template'),
+                 nil, :collection => proc { katello_template_setting_values("finish") }
+                ),
         self.set('katello_default_user_data', N_("Default user data for new Operating Systems created from synced content"),
-                 'Kickstart default user data', N_('Default synced OS user-data')),
+                 'Kickstart default user data', N_('Default synced OS user-data'),
+                 nil, :collection => proc { katello_template_setting_values("user_data") }
+                ),
         self.set('katello_default_PXELinux', N_("Default PXELinux template for new Operating Systems created from synced content"),
-                 'Kickstart default PXELinux', N_('Default synced OS PXELinux template')),
+                 'Kickstart default PXELinux', N_('Default synced OS PXELinux template'),
+                 nil, :collection => proc { katello_template_setting_values("PXELinux") }
+                ),
         self.set('katello_default_PXEGrub', N_("Default PXEGrub template for new Operating Systems created from synced content"),
-                 'Kickstart default PXEGrub', N_('Default synced OS PXEGrub template')),
+                 'Kickstart default PXEGrub', N_('Default synced OS PXEGrub template'),
+                 nil, :collection => proc { katello_template_setting_values("PXEGrub") }
+                ),
         self.set('katello_default_PXEGrub2', N_("Default PXEGrub2 template for new Operating Systems created from synced content"),
-                 'Kickstart default PXEGrub2', N_('Default synced OS PXEGrub2 template')),
+                 'Kickstart default PXEGrub2', N_('Default synced OS PXEGrub2 template'),
+                 nil, :collection => proc { katello_template_setting_values("PXEGrub2") }
+                ),
         self.set('katello_default_iPXE', N_("Default iPXE template for new Operating Systems created from synced content"),
-                 'Kickstart default iPXE', N_('Default synced OS iPXE template')),
+                 'Kickstart default iPXE', N_('Default synced OS iPXE template'),
+                 nil, :collection => proc { katello_template_setting_values("iPXE") }
+                ),
         self.set('katello_default_ptable', N_("Default partitioning table for new Operating Systems created from synced content"),
-                 'Kickstart default', N_('Default synced OS partition table')),
+                 'Kickstart default', N_('Default synced OS partition table'),
+                 nil, :collection => proc { Hash[Template.all.where(:type => "Ptable").map { |tmp| [tmp[:name], tmp[:name]] }] }
+                ),
         self.set('katello_default_kexec', N_("Default kexec template for new Operating Systems created from synced content"),
-                 'Discovery Red Hat kexec', N_('Default synced OS kexec template')),
+                 'Discovery Red Hat kexec', N_('Default synced OS kexec template'),
+                 nil, :collection => proc { katello_template_setting_values("kexec") }
+                ),
         self.set('katello_default_atomic_provision', N_("Default provisioning template for new Atomic Operating Systems created from synced content"),
-                 'Atomic Kickstart default', N_('Default synced OS Atomic template')),
+                 'Atomic Kickstart default', N_('Default synced OS Atomic template'),
+                 nil, :collection => proc { katello_template_setting_values("provision") }
+                ),
         self.set('manifest_refresh_timeout', N_('Timeout when refreshing a manifest (in seconds)'), 60 * 20, N_("Manifest refresh timeout")),
         self.set('content_action_accept_timeout', N_("Time in seconds to wait for a Host to pickup a remote action"),
                  20, N_('Accept action timeout')),
@@ -83,6 +104,11 @@ class Setting::Content < Setting
     end
     true
   end
+
+  def self.katello_template_setting_values(name)
+    templates = ProvisioningTemplate.where(:template_kind => TemplateKind.where(:name => name))
+    templates.each_with_object({}) { |tmpl, hash| hash[tmpl.name] = tmpl.name }
+  end
 end
 
 # If the database is not migrated yet, the system will not be able to load

data/app/views/katello/api/v2/repositories/base.json.rabl

@@ -3,12 +3,11 @@ object @resource
 extends 'katello/api/v2/common/identifier'
 
 attributes :pulp_id => :backend_identifier
-attributes :relative_path
+attributes :relative_path, :container_repository_name, :full_path
 
 glue(@object.root) do
   attributes :content_type, :url, :arch, :content_id
   attributes :major, :minor
-  attributes :container_repository_name
 
   child :product do |_product|
     attributes :id, :cp_id, :name

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -19,7 +19,6 @@ glue(@resource.root) do
   attributes :ssl_client_key_id
 
   attributes :product_type
-  attributes :ostree_branch_names => :ostree_branches
   attributes :upstream_username
   attributes :ostree_upstream_sync_policy, :ostree_upstream_sync_depth
   attributes :compute_ostree_upstream_sync_depth => :computed_ostree_upstream_sync_depth
@@ -45,6 +44,7 @@ glue(@resource.root) do
   end
 end
 
+attributes :ostree_branch_names => :ostree_branches
 attributes :relative_path
 attributes :promoted? => :promoted
 attributes :content_view_version_id, :library_instance_id

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/api-error-handler.service.js

@@ -32,6 +32,11 @@
             var defaultErrorMessage = translate('Something went wrong when saving the resource.');
             handleError(response, $scope, defaultErrorMessage);
         };
+
+        this.handleDELETERequestErrors = function (response, $scope) {
+            var defaultErrorMessage = translate('Something went wrong when deleting the resource.');
+            handleError(response, $scope, defaultErrorMessage);
+        };
     }
 
     angular.module('Bastion.common').service('ApiErrorHandler', ApiErrorHandler);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/content-credentials.controller.js

@@ -25,7 +25,7 @@ angular.module('Bastion.content-credentials').controller('ContentCredentialsCont
         };
 
         var nutupane = new Nutupane(ContentCredential, params);
-        $scope.controllerName = 'katello_content_credentials';
+        $scope.controllerName = 'katello_gpg_keys';
         $scope.table = nutupane.table;
         $scope.panel = {loading: false};
         $scope.removeRow = nutupane.removeRow;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-products.controller.js

@@ -15,7 +15,7 @@
         var nutupane = new Nutupane(ContentCredential, {
             id: $scope.$stateParams.contentCredentialId
         }, 'products');
-        $scope.controllerName = 'katello_content_credentials';
+        $scope.controllerName = 'katello_gpg_keys';
         nutupane.masterOnly = true;
 
         $scope.panel = $scope.panel || {error: false, loading: false};

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-repositories.controller.js

@@ -15,7 +15,7 @@
         var nutupane = new Nutupane(ContentCredential, {
             id: $scope.$stateParams.contentCredentialId
         }, 'repositories');
-        $scope.controllerName = 'katello_content_credentials';
+        $scope.controllerName = 'katello_gpg_keys';
         nutupane.masterOnly = true;
 
         $scope.panel = $scope.panel || {error: false, loading: false};

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details.controller.js

@@ -14,7 +14,7 @@
  *   Provides the functionality for the product details action pane.
  */
 angular.module('Bastion.products').controller('ProductDetailsController',
-    ['$scope', '$state', '$uibModal', 'translate', 'Product', 'Notification', 'ApiErrorHandler', function ($scope, $state, $uibModal, translate, Product, Notification, ApiErrorHandler) {
+    ['$rootScope', '$scope', '$state', '$uibModal', 'translate', 'Product', 'Notification', 'ApiErrorHandler', function ($rootScope, $scope, $state, $uibModal, translate, Product, Notification, ApiErrorHandler) {
         $scope.page = {
             error: false,
             loading: true
@@ -33,8 +33,11 @@ angular.module('Bastion.products').controller('ProductDetailsController',
 
         $scope.removeProduct = function (product) {
             product.$delete(function (data) {
-                $scope.$emit('productDelete', data.id);
-                $scope.transitionTo('products');
+                $scope.transitionTo('products').then(function() {
+                    $rootScope.$broadcast('productDelete', data.id);
+                });
+            }, function (data) {
+                ApiErrorHandler.handleDELETERequestErrors(data, $scope);
             });
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.controller.js

@@ -21,7 +21,7 @@
 angular.module('Bastion.products').controller('ProductsController',
     ['$scope', '$state', '$sce', '$location', '$uibModal', 'translate', 'Nutupane', 'Product', 'ProductBulkAction', 'CurrentOrganization', 'Notification',
     function ($scope, $state, $sce, $location, $uibModal, translate, Nutupane, Product, ProductBulkAction, CurrentOrganization, Notification) {
-        var nutupane, nutupaneParams, taskUrl, taskLink, getBulkParams, bulkError, params;
+        var nutupane, nutupaneParams, taskLink, getBulkParams, bulkError, params;
 
         getBulkParams = function () {
             return {
@@ -60,11 +60,12 @@ angular.module('Bastion.products').controller('ProductsController',
         $scope.table = nutupane.table;
 
         $scope.$on('productDelete', function (event, taskId) {
-            var message;
-            taskUrl = $scope.taskUrl(taskId);
-            taskLink = $sce.trustAsHtml("<a href=" + taskUrl + ">here</a>");
-            message = translate("Product delete operation has been initiated in the background. Click %s to monitor the progress.");
-            Notification.setSuccessMessage(message.replace("%", taskLink));
+            var message = translate("Product delete operation has been initiated in the background.");
+            Notification.setSuccessMessage(message, {
+                link: {
+                    children: translate("Click to view task"),
+                    href: translate("/foreman_tasks/tasks/%taskId").replace('%taskId', taskId)
+                }});
         });
 
         $scope.unsetProductDeletionTaskId = function () {

data/lib/katello/engine.rb

@@ -202,10 +202,6 @@ module Katello
       ::Api::V2::HostgroupsController.send :include, Katello::Concerns::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::SmartProxiesController.send :include, Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
 
-      ::SettingsController.class_eval do
-        helper Katello::Concerns::SettingsHelperExtensions
-      end
-
       Katello::EventQueue.register_event(Katello::Events::ImportHostApplicability::EVENT_TYPE, Katello::Events::ImportHostApplicability)
       Katello::EventQueue.register_event(Katello::Events::ImportPool::EVENT_TYPE, Katello::Events::ImportPool)
 

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.9.0.rc1
+  version: 3.9.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -532,7 +532,6 @@ files:
 - app/helpers/katello/concerns/dashboard_helper_extensions.rb
 - app/helpers/katello/concerns/foreman_docker/container_steps_helper_extensions.rb
 - app/helpers/katello/concerns/hosts_and_hostgroups_helper_extensions.rb
-- app/helpers/katello/concerns/settings_helper_extensions.rb
 - app/helpers/katello/concerns/smart_proxy_helper_extensions.rb
 - app/helpers/katello/errata_mailer_helper.rb
 - app/helpers/katello/hosts_and_hostgroups_helper.rb

data/app/helpers/katello/concerns/settings_helper_extensions.rb

@@ -1,60 +0,0 @@
-module Katello
-  module Concerns
-    module SettingsHelperExtensions
-      extend ActiveSupport::Concern
-
-      module Overrides
-        # rubocop:disable MethodLength
-        def value(setting)
-          return super(setting) unless [
-            'default_download_policy',
-            'katello_default_finish',
-            'katello_default_iPXE',
-            'katello_default_provision',
-            'katello_default_ptable',
-            'katello_default_PXELinux',
-            'katello_default_PXEGrub',
-            'katello_default_PXEGrub2',
-            'katello_default_user_data',
-            'katello_default_kexec',
-            'katello_default_atomic_provision'
-          ].include?(setting.name)
-
-          case setting.name
-          when "default_download_policy"
-            edit_select(setting, :value, :select_values => Hash[::Runcible::Models::YumImporter::DOWNLOAD_POLICIES.collect { |p| [p, p] }].to_json)
-          when "katello_default_finish"
-            edit_select(setting, :value, :select_values => katello_template_setting_values("finish"))
-          when "katello_default_iPXE"
-            edit_select(setting, :value, :select_values => katello_template_setting_values("iPXE"))
-          when "katello_default_provision", "katello_default_atomic_provision"
-            edit_select(setting, :value, :select_values => katello_template_setting_values("provision"))
-          when "katello_default_ptable"
-            edit_select(setting, :value, :select_values => Hash[Template.all.where(:type => "Ptable").map { |tmp| [tmp[:name], tmp[:name]] }].to_json)
-          when "katello_default_PXELinux"
-            edit_select(setting, :value, :select_values => katello_template_setting_values("PXELinux"))
-          when "katello_default_PXEGrub"
-            edit_select(setting, :value, :select_values => katello_template_setting_values("PXEGrub"))
-          when "katello_default_PXEGrub2"
-            edit_select(setting, :value, :select_values => katello_template_setting_values("PXEGrub2"))
-          when "katello_default_user_data"
-            edit_select(setting, :value, :select_values => katello_template_setting_values("user_data"))
-          when "katello_default_kexec"
-            edit_select(setting, :value, :select_values => katello_template_setting_values("kexec"))
-          end
-        end
-      end
-
-      included do
-        prepend Overrides
-      end
-
-      private
-
-      def katello_template_setting_values(name)
-        templates = ProvisioningTemplate.where(:template_kind => TemplateKind.where(:name => name))
-        templates.each_with_object({}) { |tmpl, hash| hash[tmpl.name] = tmpl.name }.to_json
-      end
-    end
-  end
-end