katello 3.5.0.rc1 → 3.5.0.rc2

data/app/views/katello/api/v2/activation_keys/index.json.rabl

@@ -1,3 +1,6 @@
 object false
+extends "katello/api/v2/common/metadata"
 
-extends "katello/api/v2/common/index"
+child @collection[:results] => :results do
+  extends "katello/api/v2/activation_keys/base"
+end

data/app/views/katello/api/v2/activation_keys/product_content.json.rabl

@@ -13,17 +13,17 @@ child @collection[:results] => :results do
   end
 
   node :override do |pc|
-    pc.legacy_content_override(@activation_key)
+    pc.legacy_content_override
   end
 
   node :overrides do |pc|
-    pc.content_overrides(@activation_key).map do |override|
+    pc.content_overrides.map do |override|
       {:name => override.name, :value => override.computed_value}
     end
   end
 
   node :enabled_content_override do |pc|
-    override = pc.enabled_content_override(@activation_key)
+    override = pc.enabled_content_override
     override.computed_value if override
   end
 

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

@@ -1,40 +1,4 @@
 object @resource
-
-attributes :id, :name, :description, :unlimited_hosts, :auto_attach
-
-extends 'katello/api/v2/common/org_reference'
-
-attributes :content_view_id
-
-child :content_view => :content_view do
-  attributes :id, :name
-end
-
-child :environment => :environment do
-  attributes :name, :id
-end
-attributes :environment_id
-
-attributes :usage_count, :user_id, :max_hosts, :system_template_id, :release_version,
-           :service_level, :auto_attach
-
-child :products => :products do |_product|
-  attributes :id, :name
-end
-
-node :permissions do |activation_key|
-  {
-    :view_activation_keys => activation_key.readable?,
-    :edit_activation_keys => activation_key.editable?,
-    :destroy_activation_keys => activation_key.deletable?
-  }
-end
-
-child :host_collections => :host_collections do
-  attributes :id
-  attributes :name
-end
-
+extends "katello/api/v2/activation_keys/base"
+attributes :service_level
 attributes :content_overrides
-
-extends 'katello/api/v2/common/timestamps'

data/app/views/katello/api/v2/common/releases.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+node :results do
+  @collection[:results]
+end

data/config/routes/api/v2.rb

@@ -170,6 +170,7 @@ Katello::Engine.routes.draw do
             post :autoattach_subscriptions
             get :download_debug_certificate
             get :redhat_provider
+            get :releases
           end
           api_resources :products, :only => [:index]
           api_resources :repositories, :only => [:index]

data/config/routes/overrides.rb

@@ -74,6 +74,7 @@ Foreman::Application.routes.draw do
             match '/bulk/remove_content' => 'hosts_bulk_actions#remove_content', :via => :put
             match '/bulk/destroy' => 'hosts_bulk_actions#destroy_hosts', :via => :put
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
+            match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
           end

data/db/migrate/20171010170443_add_index_to_katello_content_facet_errata.rb

@@ -0,0 +1,5 @@
+class AddIndexToKatelloContentFacetErrata < ActiveRecord::Migration
+  def change
+    add_index :katello_content_facet_errata, :content_facet_id, using: 'btree'
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-key.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.activation-keys').factory('ActivationKey',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/v2/activation_keys/:id/:action/:action2', {id: '@id'}, {
+        return BastionResource('katello/api/v2/activation_keys/:id/:action/:action2', {id: '@id'}, {
             get: {method: 'GET', params: {fields: 'full'}},
             update: {method: 'PUT'},
             copy: {method: 'POST', params: {action: 'copy'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-host-collections.controller.js

@@ -8,18 +8,16 @@
  * @requires translate
  * @requires ActivationKey
  * @requires Nutupane
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for adding host collections to an activation key.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyAddHostCollectionsController',
-    ['$scope', '$q', '$location', 'translate', 'ActivationKey', 'Nutupane',
-    function ($scope, $q, $location, translate, ActivationKey, Nutupane) {
+    ['$scope', '$q', '$location', 'translate', 'ActivationKey', 'Nutupane', 'Notification',
+    function ($scope, $q, $location, translate, ActivationKey, Nutupane, Notification) {
         var hostCollectionsPane, params;
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         params = {
             'search': $location.search().search || "",
             'sort_by': 'name',
@@ -46,9 +44,11 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAddHostCollec
             };
 
             success = function (response) {
-                $scope.successMessages = [translate('Added %x host collections to activation key "%y".')
+                var message = translate('Added %x host collections to activation key "%y".')
                     .replace('%x', $scope.table.numSelected)
-                    .replace('%y', $scope.activationKey.name)];
+                    .replace('%y', $scope.activationKey.name);
+
+                Notification.setSuccessMessage(message);
                 $scope.table.working = false;
                 $scope.table.selectAll(false);
                 hostCollectionsPane.refresh();
@@ -58,7 +58,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAddHostCollec
 
             error = function (response) {
                 deferred.reject(response.data.errors);
-                $scope.errorMessages = response.data.errors.base;
+                Notification.setErrorMessage(response.data.errors.base);
                 $scope.table.working = false;
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-subscriptions.controller.js

@@ -11,13 +11,14 @@
  * @requires Subscription
  * @requires ActivationKey
  * @requires SubscriptionsHelper
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the activation key add subscriptions pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyAddSubscriptionsController',
-    ['$scope', '$state', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'ActivationKey', 'SubscriptionsHelper',
-    function ($scope, $state, $location, translate, Nutupane, CurrentOrganization, Subscription, ActivationKey, SubscriptionsHelper) {
+    ['$scope', '$state', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'ActivationKey', 'SubscriptionsHelper', 'Notification',
+    function ($scope, $state, $location, translate, Nutupane, CurrentOrganization, Subscription, ActivationKey, SubscriptionsHelper, Notification) {
 
         var params;
 
@@ -51,11 +52,11 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAddSubscripti
 
             $scope.isAdding = true;
             ActivationKey.addSubscriptions({id: $scope.activationKey.id, 'subscriptions': selected}, function () {
-                $scope.successMessages.push(translate("Successfully added %s subscriptions.").replace('%s', selected.length));
+                Notification.setErrorMessage(translate("Successfully added %s subscriptions.").replace('%s', selected.length));
                 $scope.isAdding = false;
                 $scope.contentNutupane.refresh();
             }, function (response) {
-                $scope.errorMessages.push(response.data.displayMessage);
+                Notification.setErrorMessage(response.data.displayMessage);
                 $scope.isAdding = false;
                 $scope.contentNutupane.refresh();
             });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-copy.controller.js

@@ -8,15 +8,12 @@
      * @description
      *   For copying a host collection.
      */
-    function ActivationKeyCopyController($scope, ActivationKey) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
+    function ActivationKeyCopyController($scope, ActivationKey, Notification) {
         $scope.copy = function (newName) {
             ActivationKey.copy({id: $scope.activationKey.id, 'new_name': newName}, function (response) {
                 $scope.transitionTo('activation-key.info', {activationKeyId: response.id});
             }, function (response) {
-                $scope.copyErrorMessages.push(response.data.displayMessage);
+                Notification.setErrorMessage(response.data.displayMessage);
             });
         };
     }
@@ -25,6 +22,6 @@
         .module('Bastion.activation-keys')
         .controller('ActivationKeyCopyController', ActivationKeyCopyController);
 
-    ActivationKeyCopyController.$inject = ['$scope', 'ActivationKey'];
+    ActivationKeyCopyController.$inject = ['$scope', 'ActivationKey', 'Notification'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js

@@ -9,18 +9,15 @@
  * @requires ActivationKey
  * @requires CurrentOrganization
  * @requires Organization
- * @requires GlobalNotification
+ * @requires Notification
  * @requires ApiErrorHandler
  *
  * @description
  *   Provides the functionality for the activation key details action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'GlobalNotification', 'ApiErrorHandler',
-    function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, GlobalNotification, ApiErrorHandler) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-        $scope.copyErrorMessages = [];
+    ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'Notification', 'ApiErrorHandler',
+    function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, Notification, ApiErrorHandler) {
         $scope.panel = {
             error: false,
             loading: true
@@ -43,10 +40,10 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsContro
 
             activationKey.$update(function (response) {
                 deferred.resolve(response);
-                $scope.successMessages.push(translate('Activation Key updated'));
+                Notification.setSuccessMessage(translate('Activation Key updated'));
             }, function (response) {
                 deferred.reject(response);
-                $scope.errorMessages.push(translate("An error occurred saving the Activation Key: ") + response.data.displayMessage);
+                Notification.setErrorMessage(translate("An error occurred saving the Activation Key: ") + response.data.displayMessage);
             });
             return deferred.promise;
         };
@@ -58,9 +55,9 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsContro
         $scope.removeActivationKey = function (activationKey) {
             activationKey.$delete(function () {
                 $scope.transitionTo('activation-keys');
-                GlobalNotification.setSuccessMessage(translate('Activation Key removed.'));
+                Notification.setSuccessMessage(translate('Activation Key removed.'));
             }, function (response) {
-                GlobalNotification.setErrorMessage(translate("An error occurred removing the Activation Key: ") + response.data.displayMessage);
+                Notification.setErrorMessage(translate("An error occurred removing the Activation Key: ") + response.data.displayMessage);
             });
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-host-collections.controller.js

@@ -17,9 +17,6 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectio
     function ($scope, $q, $location, translate, ActivationKey, Nutupane) {
         var hostCollectionsPane, params;
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         params = {
             'id': $scope.$stateParams.activationKeyId,
             'search': $location.search().search || "",
@@ -46,9 +43,11 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectio
             };
 
             success = function (response) {
-                $scope.successMessages = [translate('Removed %x host collections from activation key "%y".')
+                var message = translate('Removed %x host collections from activation key "%y".')
                     .replace('%x', $scope.table.numSelected)
-                    .replace('%y', $scope.activationKey.name)];
+                    .replace('%y', $scope.activationKey.name);
+
+                Notification.setSuccessMessage(message);
                 $scope.table.working = false;
                 $scope.table.selectAll(false);
                 hostCollectionsPane.refresh();
@@ -58,7 +57,9 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectio
 
             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/activation-keys/details/activation-key-repository-sets.controller.js

@@ -7,15 +7,15 @@
  * @requires Nutupane
  * @requires ActivationKey
  * @requires ContentOverrideHelper
- * @requires GlobalNotification
+ * @requires Notification
  * @requires CurrentOrganization
  *
  * @description
  *   Provides the functionality for the activation-key products action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySetsController',
-    ['$scope', 'translate', 'Nutupane', 'ActivationKey', 'ContentOverrideHelper', 'GlobalNotification', 'CurrentOrganization',
-    function ($scope, translate, Nutupane, ActivationKey, ContentOverrideHelper, GlobalNotification, CurrentOrganization) {
+    ['$scope', 'translate', 'Nutupane', 'ActivationKey', 'ContentOverrideHelper', 'Notification', 'CurrentOrganization',
+    function ($scope, translate, Nutupane, ActivationKey, ContentOverrideHelper, Notification, CurrentOrganization) {
         var params, saveContentOverride, success, error;
 
         params = {
@@ -42,13 +42,13 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
 
         success = function () {
             $scope.table.working = false;
-            GlobalNotification.setSuccessMessage(translate('Repository Sets settings saved successfully.'));
+            Notification.setSuccessMessage(translate('Repository Sets settings saved successfully.'));
             $scope.nutupane.refresh();
         };
 
         error = function (response) {
             $scope.table.working = false;
-            GlobalNotification.setErrorMessage(response.data.errors);
+            Notification.setErrorMessage(response.data.errors);
         };
 
         saveContentOverride = function (contentOverrides) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js

@@ -8,13 +8,14 @@
  * @requires Nutupane
  * @requires ActivationKey
  * @requires SubscriptionsHelper
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the activation key subscriptions details action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'Subscription', 'SubscriptionsHelper',
-    function ($scope, $location, translate, Nutupane, ActivationKey, Subscription, SubscriptionsHelper) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'Subscription', 'SubscriptionsHelper', 'Notification',
+    function ($scope, $location, translate, Nutupane, ActivationKey, Subscription, SubscriptionsHelper, Notification) {
         var params;
 
         params = {
@@ -48,11 +49,11 @@ angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptions
             ActivationKey.removeSubscriptions({id: $scope.activationKey.id, 'subscriptions': selected}, function () {
                 $scope.contentNutupane.table.selectAll(false);
                 $scope.contentNutupane.refresh();
-                $scope.successMessages.push(translate("Successfully removed %s subscriptions.").replace('%s', selected.length));
+                Notification.setSuccessMessage(translate("Successfully removed %s subscriptions.").replace('%s', selected.length));
                 $scope.isRemoving = false;
             }, function (response) {
                 $scope.isRemoving = false;
-                $scope.errorMessages.push(translate("An error occurred removing the subscriptions.") + response.data.displayMessage);
+                Notification.setErrorMessage(translate("An error occurred removing the subscriptions.") + response.data.displayMessage);
             });
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-host-collections-table.html

@@ -1,6 +1,4 @@
-<section class="nutupane-sub-section">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
+<section>
   <div data-extend-template="layouts/partials/table.html">
     <div data-block="search">
       <input type="text"

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

@@ -8,13 +8,16 @@
  * @requires translate
  * @requires CapsuleContent
  * @requires AggregateTask
+ * @requires CurrentOrganization
+ * @requires syncState
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the capsule-content page.
  */
 angular.module('Bastion.capsule-content').controller('CapsuleContentController',
-    ['$scope', '$urlMatcherFactory', '$location', 'translate', 'CapsuleContent', 'AggregateTask', 'CurrentOrganization', 'syncState',
-    function ($scope, $urlMatcherFactory, $location, translate, CapsuleContent, AggregateTask, CurrentOrganization, syncState) {
+    ['$scope', '$urlMatcherFactory', '$location', 'translate', 'CapsuleContent', 'AggregateTask', 'CurrentOrganization', 'syncState', 'Notification',
+    function ($scope, $urlMatcherFactory, $location, translate, CapsuleContent, AggregateTask, CurrentOrganization, syncState, Notification) {
 
         var refreshSyncStatus;
         var urlMatcher = $urlMatcherFactory.compile("/smart_proxies/:capsuleId");
@@ -22,7 +25,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
 
         function processError(response) {
             if (response.data && response.data.displayMessage) {
-                $scope.syncErrorMessages = [response.data.displayMessage];
+                Notification.setErrorMessage(response.data.displayMessage);
             }
         }
 
@@ -95,7 +98,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
                         } else if (errorCount > 1) {
                             errorMessage += " " + translate("Plus 1 more error");
                         }
-                        $scope.syncErrorMessages = [errorMessage];
+                        Notification.setErrorMessage(errorMessage);
                     }
                 }
                 $scope.syncState.set(stateFromTask($scope.syncTask));
@@ -125,7 +128,6 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
         $scope.syncCapsule = function (skipMetadataCheck) {
             if (!$scope.syncState.is(syncState.SYNCING)) {
 
-                $scope.syncErrorMessages = [];
                 $scope.syncState.set(syncState.SYNC_TRIGGERED);
 
                 CapsuleContent.sync({id: capsuleId, 'skip_metadata_check': skipMetadataCheck}).$promise.then(function (task) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.capsule-content').factory('CapsuleContent',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/capsules/:id/content/:action', {id: '@id'}, {
+        return BastionResource('katello/api/capsules/:id/content/:action', {id: '@id'}, {
           syncStatus: {method: 'GET', isArray: false, params: {action: 'sync'}},
           sync: {method: 'post', isArray: false, params: {action: 'sync'}},
           cancelSync: {method: 'delete', isArray: false, params: {action: 'sync'}}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsules/capsule.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.capsules').factory('Capsule',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/capsules/:id/:action', {id: '@id'}, {
+        return BastionResource('katello/api/capsules/:id/:action', {id: '@id'}, {
         });
 
     }]

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

@@ -8,24 +8,14 @@
      * @description
      *   Provides common functionality in handling Katello/Foreman API Errors.
      */
-    function ApiErrorHandler(translate, GlobalNotification) {
+    function ApiErrorHandler(translate, Notification) {
         function handleError(response, $scope, defaultErrorMessage) {
-            var hasScopeErrorMessages = $scope && $scope.hasOwnProperty('errorMessages');
-
             if (response.hasOwnProperty('data') && response.data.hasOwnProperty('errors')) {
-                if (hasScopeErrorMessages) {
-                    $scope.errorMessages = response.data.errors;
-                } else {
-                    angular.forEach(response.data.errors, function (error) {
-                        GlobalNotification.setErrorMessage(error);
-                    });
-                }
+                angular.forEach(response.data.errors, function (error) {
+                    Notification.setErrorMessage(error);
+                });
             } else {
-                if (hasScopeErrorMessages) {
-                    $scope.errorMessages = [defaultErrorMessage];
-                } else {
-                    GlobalNotification.setErrorMessage(defaultErrorMessage);
-                }
+                Notification.setErrorMessage(defaultErrorMessage);
             }
 
             if ($scope && $scope.hasOwnProperty('panel')) {
@@ -45,5 +35,5 @@
     }
 
     angular.module('Bastion.common').service('ApiErrorHandler', ApiErrorHandler);
-    ApiErrorHandler.$inject = ['translate', 'GlobalNotification'];
+    ApiErrorHandler.$inject = ['translate', 'Notification'];
 })();