katello 3.5.0.rc1 → 3.5.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-add-hosts.controller.js

@@ -57,18 +57,18 @@ angular.module('Bastion.host-collections').controller('HostCollectionAddHostsCon
             $scope.isAdding = true;
             HostCollection.addHosts({id: $scope.hostCollection.id, 'host_ids': selected}, function (data) {
                 angular.forEach(data.displayMessages.success, function (success) {
-                    $scope.$parent.successMessages.push(success);
+                    Notification.setSuccessMessage(success);
                 });
 
                 angular.forEach(data.displayMessages.error, function (error) {
-                    $scope.$parent.errorMessages.push(error);
+                    Notification.setErrorMessage(error);
                 });
 
                 $scope.isAdding = false;
                 contentNutupane.refresh();
                 $scope.refreshHostCollection();
             }, function (response) {
-                $scope.$parent.errorMessages.push(response.data.displayMessage);
+                Notification.setErrorMessage(response.data.displayMessage);
                 $scope.isAdding = false;
             });
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-copy.controller.js

@@ -8,15 +8,12 @@
      * @description
      *   For copying a host collection.
      */
-    function HostCollectionCopyController($scope, HostCollection) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
+    function HostCollectionCopyController($scope, Notification, HostCollection) {
         $scope.copy = function (newName) {
             HostCollection.copy({id: $scope.$stateParams.hostCollectionId, 'host_collection': {name: newName}}, function (response) {
                 $scope.transitionTo('host-collection.info', {hostCollectionId: response.id});
             }, function (response) {
-                $scope.$parent.errorMessages.push(response.data.displayMessage);
+                Notification.setErrorMessage(response.data.displayMessage);
             });
         };
     }
@@ -25,6 +22,6 @@
         .module('Bastion.host-collections')
         .controller('HostCollectionCopyController', HostCollectionCopyController);
 
-    HostCollectionCopyController.$inject = ['$scope', 'HostCollection'];
+    HostCollectionCopyController.$inject = ['$scope', 'Notification', 'HostCollection'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js

@@ -9,17 +9,15 @@
  * @requires Host
  * @requires ContentHostsModalHelper
  * @requires HostCollection
+ * @requires Notification
  * @requires ApiErrorHandler
  *
  * @description
  *   Provides the functionality for the host collection details action pane.
  */
 angular.module('Bastion.host-collections').controller('HostCollectionDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'Host', 'ContentHostsModalHelper', 'HostCollection', 'ApiErrorHandler',
-    function ($scope, $state, $q, translate, Host, ContentHostsModalHelper, HostCollection, ApiErrorHandler) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
+    ['$scope', '$state', '$q', 'translate', 'Host', 'ContentHostsModalHelper', 'HostCollection', 'Notification', 'ApiErrorHandler',
+    function ($scope, $state, $q, translate, Host, ContentHostsModalHelper, HostCollection, Notification, ApiErrorHandler) {
         $scope.panel = {
             error: false,
             loading: true
@@ -38,21 +36,14 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
         });
 
         $scope.getHostIds = function() {
-            return $scope.selected;
+            return {
+                included: {
+                    search: 'host_collection_id = %s'.replace('%s', $scope.$stateParams.hostCollectionId)
+                }
+            };
         };
 
-        $scope.host = Host.get({search: "host_collection_id = " + $scope.$stateParams.hostCollectionId}, function (response) {
-            $scope.selected = {
-                included: {
-                    ids: _.map(response.results, 'id')
-                },
-                excluded: {
-                    ids: []
-                }};
-        ContentHostsModalHelper.resolveFunc = $scope.getHostIds;}, function (response) {
-            $scope.panel.loading = false;
-            ApiErrorHandler.handleGETRequestErrors(response, $scope);
-        });
+        ContentHostsModalHelper.resolveFunc = $scope.getHostIds;
 
         $scope.refreshHostCollection = function () {
             $scope.hostCollection.$get().then(function (hostCollection) {
@@ -87,11 +78,11 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
 
             hostCollection.$update(function (response) {
                 deferred.resolve(response);
-                $scope.successMessages.push(translate('Host Collection updated'));
+                Notification.setSuccessMessage(translate('Host Collection updated'));
                 $scope.table.replaceRow(response);
             }, function (response) {
                 deferred.reject(response);
-                $scope.errorMessages.push(translate("An error occurred saving the Host Collection: ") + response.data.displayMessage);
+                Notification.setErrorMessage(translate("An error occurred saving the Host Collection: ") + response.data.displayMessage);
             });
             return deferred.promise;
         };
@@ -99,9 +90,9 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
         $scope.removeHostCollection = function (hostCollection) {
             hostCollection.$delete(function () {
                 $scope.transitionTo('host-collections');
-                $scope.successMessages.push(translate('Host Collection removed.'));
+                Notification.setSuccessMessage(translate('Host Collection removed.'));
             }, function (response) {
-                $scope.errorMessages.push(translate("An error occurred removing the Host Collection: ") + response.data.displayMessage);
+                Notification.setErrorMessage(translate("An error occurred removing the Host Collection: ") + response.data.displayMessage);
             });
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-hosts.controller.js

@@ -4,6 +4,7 @@
  *
  * @requires $scope
  * @requires $location
+ * @requires Notification
  * @requires translate
  * @requires Nutupane
  * @requires CurrentOrganization
@@ -14,8 +15,8 @@
  *   Provides the functionality for the host collection details action pane.
  */
 angular.module('Bastion.host-collections').controller('HostCollectionHostsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostCollection',
-    function ($scope, $location, translate, Nutupane, CurrentOrganization, Host, HostCollection) {
+    ['$scope', '$location', 'Notification', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostCollection',
+    function ($scope, $location, Notification, translate, Nutupane, CurrentOrganization, Host, HostCollection) {
         var params, nutupaneParams;
 
         params = {
@@ -57,18 +58,18 @@ angular.module('Bastion.host-collections').controller('HostCollectionHostsContro
                 $scope.contentNutupane.refresh();
 
                 angular.forEach(data.displayMessages.success, function (success) {
-                    $scope.$parent.successMessages.push(success);
+                    Notification.setSuccessMessage(success);
                 });
 
                 angular.forEach(data.displayMessages.error, function (error) {
-                    $scope.$parent.errorMessages.push(error);
+                    Notification.setErrorMessage(error);
                 });
                 $scope.refreshHostCollection();
 
                 $scope.isRemoving = false;
             }, function (response) {
                 $scope.isRemoving = false;
-                $scope.$parent.errorMessages.push(translate("An error occurred removing the content hosts.") + response.data.displayMessage);
+                Notification.setErrorMessage(translate("An error occurred removing the content hosts.") + response.data.displayMessage);
             });
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html

@@ -7,13 +7,13 @@
     <dl class="dl-horizontal dl-horizontal-left">
       <dt translate>Name</dt>
       <dd bst-edit-text="hostCollection.name"
-          readonly="denied('edit_host_collection', hostCollection)"
+          readonly="denied('edit_host_collections', hostCollection)"
           on-save="save(hostCollection)">
       </dd>
 
       <dt translate>Description</dt>
         <dd bst-edit-textarea="hostCollection.description"
-            readonly="denied('edit_host_collection', hostCollection)"
+            readonly="denied('edit_host_collections', hostCollection)"
             on-save="save(hostCollection)">
         </dd>
 
@@ -29,7 +29,7 @@
 
       <dt translate>Content Host Limit</dt>
       <dd bst-edit-custom="hostCollection.max_hosts"
-          readonly="denied('edit_host_collection', hostCollection)"
+          readonly="denied('edit_host_collections', hostCollection)"
           formatter="unlimitedFilter"
           formatter-options="hostCollection.unlimited_hosts"
           on-save="save(hostCollection)">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/host-collection.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.host-collections').factory('HostCollection',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/v2/host_collections/:id/:action', {id: '@id'}, {
+        return BastionResource('katello/api/v2/host_collections/:id/:action', {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/hosts/host-bulk-action.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.hosts').factory('HostBulkAction',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/api/v2/hosts/bulk/:action', {}, {
+        return BastionResource('api/v2/hosts/bulk/:action', {}, {
             addHostCollections: {method: 'PUT', params: {action: 'add_host_collections'}},
             removeHostCollections: {method: 'PUT', params: {action: 'remove_host_collections'}},
             updateRepositorySets: {method: 'PUT', params: {action: 'content_overrides'}},
@@ -23,6 +23,7 @@ angular.module('Bastion.hosts').factory('HostBulkAction',
             autoAttach: {method: 'PUT', params: {action: 'auto_attach'}},
             destroyHosts: {method: 'PUT', params: {action: 'destroy'}},
             environmentContentView: {method: 'PUT', params: {action: 'environment_content_view'}},
+            releaseVersion: {method: 'PUT', params: {action: 'release_version'}},
             availableIncrementalUpdates: {method: 'POST', isArray: true, params: {action: 'available_incremental_updates'}}
         });
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-erratum.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.hosts').factory('HostErratum',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/api/v2/hosts/:id/errata/:errata_id/:action', {id: '@id'}, {
+        return BastionResource('api/v2/hosts/:id/errata/:errata_id/:action', {id: '@id'}, {
             get: {method: 'GET', isArray: false, transformResponse: function (data) {
                 data = angular.fromJson(data);
                 angular.forEach(data.results, function (errata) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-package.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.hosts').factory('HostPackage',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/api/v2/hosts/:id/packages/:action', {id: '@id'}, {
+        return BastionResource('api/v2/hosts/:id/packages/:action', {id: '@id'}, {
             get: {method: 'GET', isArray: false},
             remove: {method: 'PUT', params: {action: 'remove'}},
             install: {method: 'PUT', params: {action: 'install'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.hosts').factory('HostSubscription',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/api/v2/hosts/:id/subscriptions/:action/', {id: '@id'}, {
+        return BastionResource('api/v2/hosts/:id/subscriptions/:action/', {id: '@id'}, {
             events: {method: 'GET', params: {action: 'events'}},
             autoAttach: {method: 'PUT', params: {action: 'auto_attach'}},
             removeSubscriptions: {method: 'put', isArray: false, params: {action: 'remove_subscriptions'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.hosts').factory('HostTraces',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/api/v2/hosts/:id/traces/:action', {id: '@id'}, {
+        return BastionResource('api/v2/hosts/:id/traces/:action', {id: '@id'}, {
             get: {method: 'GET', isArray: false}
         });
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.hosts').factory('Host',
     ['BastionResource', function (BastionResource) {
-        var resource = BastionResource('/api/v2/hosts/:id/:action', {id: '@id'}, {
+        var resource = BastionResource('api/v2/hosts/:id/:action', {id: '@id'}, {
             postIndex: {method: 'POST', params: {action: 'post_index'}},
             update: {method: 'PUT'},
             updateHostCollections: {method: 'PUT', params: {action: 'host_collections'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organization.factory.js

@@ -11,19 +11,21 @@
 angular.module('Bastion.organizations').factory('Organization',
     ['BastionResource', 'CurrentOrganization', function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/organizations/:id/:action',
+        return BastionResource('katello/api/v2/organizations/:id/:action',
             {id: '@id'},
             {
                 update: { method: 'PUT' },
+                releaseVersions: {method: 'GET', params: {action: 'releases'}},
+
                 select: {
                     method: 'GET',
-                    url: '/organizations/:label/select'
+                    url: 'organizations/:label/select'
                 },
                 repoDiscover: { method: 'POST', params: {action: 'repo_discover'}},
                 cancelRepoDiscover: {method: 'POST', params: {action: 'cancel_repo_discover'}},
                 paths: {
                     method: 'GET',
-                    url: '/katello/api/v2/organizations/:id/environments/paths',
+                    url: 'katello/api/v2/organizations/:id/environments/paths',
                     isArray: true,
                     transformResponse: function (data) {
                         return angular.fromJson(data).results;
@@ -31,7 +33,7 @@ angular.module('Bastion.organizations').factory('Organization',
                 },
                 readableEnvironments: {
                     method: 'GET',
-                    url: '/katello/api/v2/organizations/:id/environments/paths',
+                    url: 'katello/api/v2/organizations/:id/environments/paths',
                     isArray: true,
                     transformResponse: function (data) {
                         // transform [{environments : [{id, name, permissions: {readable : true}}]}]
@@ -46,7 +48,7 @@ angular.module('Bastion.organizations').factory('Organization',
                 },
                 redhatProvider: {
                     method: 'GET',
-                    url: '/katello/api/v2/organizations/:organization_id/redhat_provider',
+                    url: 'katello/api/v2/organizations/:organization_id/redhat_provider',
                     params: {'organization_id': CurrentOrganization}
                 }
             }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branch.factory.js

@@ -9,7 +9,7 @@
      *   Provides a BastionResource for interacting with Ostree Branches
      */
     function OstreeBranch(BastionResource) {
-        return BastionResource('/katello/api/v2/ostree_branches/:id',
+        return BastionResource('katello/api/v2/ostree_branches/:id',
             {'id': '@id'},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/package-groups/package-group.factory.js

@@ -9,7 +9,7 @@
      *   Provides a BastionResource for interacting with Package Groups
      */
     function PackageGroup(BastionResource) {
-        return BastionResource('/katello/api/v2/package_groups/:id',
+        return BastionResource('katello/api/v2/package_groups/:id',
             {'id': '@id'},
             {
               autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/package.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.packages').factory('Package',
     ['BastionResource', 'CurrentOrganization', function (BastionResource) {
 
-        return BastionResource('/katello/api/v2/packages/:id',
+        return BastionResource('katello/api/v2/packages/:id',
             {'id': '@id'},
             {
                 'autocomplete': {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/product-bulk-action.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.products').factory('ProductBulkAction',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/v2/products/bulk/:action', {}, {
+        return BastionResource('katello/api/v2/products/bulk/:action', {}, {
             removeProducts: {method: 'PUT', params: {action: 'destroy'}},
             syncProducts: {method: 'PUT', params: {action: 'sync'}},
             updateProductSyncPlan: {method: 'PUT', params: {action: 'sync_plan'}}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-advanced-sync-modal.controller.js

@@ -8,7 +8,7 @@
  * @requires translate
  * @requires ProductBulkAction
  * @requires CurrentOrganization
- * @requires GlobalNotification
+ * @requires Notification
  * @requires $uibModalInstance
  * @requires bulkParams
  *
@@ -16,8 +16,8 @@
  *   A controller for providing bulk action functionality to the products page.
  */
 angular.module('Bastion.products').controller('ProductsBulkAdvancedSyncModalController',
-    ['$scope', '$state', '$sce', 'translate', 'ProductBulkAction', 'CurrentOrganization', 'GlobalNotification', '$uibModalInstance', 'bulkParams',
-        function ($scope, $state, $sce, translate, ProductBulkAction, CurrentOrganization, GlobalNotification, $uibModalInstance, bulkParams) {
+    ['$scope', '$state', '$sce', 'translate', 'ProductBulkAction', 'CurrentOrganization', 'Notification', '$uibModalInstance', 'bulkParams',
+        function ($scope, $state, $sce, translate, ProductBulkAction, CurrentOrganization, Notification, $uibModalInstance, bulkParams) {
             var success, error;
 
             success = function (task) {
@@ -27,12 +27,12 @@ angular.module('Bastion.products').controller('ProductsBulkAdvancedSyncModalCont
                 message = translate("Product syncs has been initiated in the background. " +
                     "Click %s to monitor the progress.");
 
-                GlobalNotification.setRenderedSuccessMessage(message.replace('%s', taskLink));
+                Notification.setRenderedSuccessMessage(message.replace('%s', taskLink));
             };
 
             error = function (response) {
                 angular.forEach(response.data.errors, function(message) {
-                    GlobalNotification.setErrorMessage(translate("An error occurred initiating the sync: " ) + message);
+                    Notification.setErrorMessage(translate("An error occurred initiating the sync: " ) + message);
                 });
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-sync-plan-modal.controller.js

@@ -9,7 +9,7 @@
  * @requires ProductBulkAction
  * @requires SyncPlan
  * @requires CurrentOrganization
- * @requires GlobalNotification
+ * @requires Notification
  * @requires $uibModalInstance
  * @requires bulkParams
  *
@@ -17,8 +17,8 @@
  *   A controller for providing bulk action functionality to the products page.
  */
 angular.module('Bastion.products').controller('ProductsBulkSyncPlanModalController',
-    ['$scope', '$state', 'translate', 'Nutupane', 'ProductBulkAction', 'SyncPlan', 'CurrentOrganization', 'GlobalNotification', '$uibModalInstance', 'bulkParams',
-        function ($scope, $state, translate, Nutupane, ProductBulkAction, SyncPlan, CurrentOrganization, GlobalNotification, $uibModalInstance, bulkParams) {
+    ['$scope', '$state', 'translate', 'Nutupane', 'ProductBulkAction', 'SyncPlan', 'CurrentOrganization', 'Notification', '$uibModalInstance', 'bulkParams',
+        function ($scope, $state, translate, Nutupane, ProductBulkAction, SyncPlan, CurrentOrganization, Notification, $uibModalInstance, bulkParams) {
             var success, error, nutupane, params;
 
             params = {
@@ -37,11 +37,11 @@ angular.module('Bastion.products').controller('ProductsBulkSyncPlanModalControll
 
             success = function (response) {
                 angular.forEach(response.displayMessages.success, function(message) {
-                    GlobalNotification.setSuccessMessage(message);
+                    Notification.setSuccessMessage(message);
                 });
 
                 angular.forEach(response.displayMessages.error, function(message) {
-                    GlobalNotification.setErrorMessage(message);
+                    Notification.setErrorMessage(message);
                 });
 
                 nutupane.invalidate();
@@ -49,7 +49,7 @@ angular.module('Bastion.products').controller('ProductsBulkSyncPlanModalControll
 
             error = function (response) {
                 angular.forEach(response.data.errors, function(message) {
-                    GlobalNotification.setErrorMessage(translate("An error occurred updating the sync plan: " ) + message);
+                    Notification.setErrorMessage(translate("An error occurred updating the sync plan: " ) + message);
                 });
             };
 

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

@@ -9,17 +9,14 @@
  * @requires SyncPlan
  * @requires GPGKey
  * @requires MenuExpander
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the product details action pane.
  */
 angular.module('Bastion.products').controller('ProductDetailsInfoController',
-    ['$scope', '$state', '$q', 'translate', 'Product', 'SyncPlan', 'GPGKey', 'MenuExpander',
-    function ($scope, $state, $q, translate, Product, SyncPlan, GPGKey, MenuExpander) {
-
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
+    ['$scope', '$state', '$q', 'translate', 'Product', 'SyncPlan', 'GPGKey', 'MenuExpander', 'Notification',
+    function ($scope, $state, $q, translate, Product, SyncPlan, GPGKey, MenuExpander, Notification) {
         $scope.menuExpander = MenuExpander;
         $scope.page = $scope.page || {loading: false};
 
@@ -49,11 +46,11 @@ angular.module('Bastion.products').controller('ProductDetailsInfoController',
 
             product.$update(function (response) {
                 deferred.resolve(response);
-                $scope.successMessages.push(translate('Product Saved'));
+                Notification.setSuccessMessage(translate('Product Saved'));
             }, function (response) {
                 deferred.reject(response);
                 angular.forEach(response.data.errors, function (errorMessage) {
-                    $scope.errorMessages.push(translate("An error occurred saving the Product: ") + errorMessage);
+                    Notification.setErrorMessage(translate("An error occurred saving the Product: ") + errorMessage);
                 });
             });