katello 3.5.0.rc1 → 3.5.0.rc2

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

@@ -7,16 +7,14 @@
  * @requires $uibModal
  * @requires translate
  * @requires Product
- * @requires GlobalNotification
+ * @requires Notification
  * @requires ApiErrorHandler
  *
  * @description
  *   Provides the functionality for the product details action pane.
  */
 angular.module('Bastion.products').controller('ProductDetailsController',
-    ['$scope', '$state', '$uibModal', 'translate', 'Product', 'GlobalNotification', 'ApiErrorHandler', function ($scope, $state, $uibModal, translate, Product, GlobalNotification, ApiErrorHandler) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
+    ['$scope', '$state', '$uibModal', 'translate', 'Product', 'Notification', 'ApiErrorHandler', function ($scope, $state, $uibModal, translate, Product, Notification, ApiErrorHandler) {
         $scope.page = {
             error: false,
             loading: true
@@ -45,7 +43,9 @@ angular.module('Bastion.products').controller('ProductDetailsController',
                 $state.go('product.tasks.details', {taskId: task.id});
             },
             function (response) {
-                $scope.errorMessages = response.data.errors;
+                angular.forEach(response.data.errors, function (error) {
+                    Notification.setErrorMessage(error);
+                });
             });
         };
 
@@ -71,7 +71,7 @@ angular.module('Bastion.products').controller('ProductDetailsController',
 
         $scope.updateProduct = function () {
             function success() {
-                GlobalNotification.setSuccessMessage(translate('Sync Plan created and assigned to product.'));
+                Notification.setSuccessMessage(translate('Sync Plan created and assigned to product.'));
             }
 
             function error(response) {

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

@@ -4,6 +4,8 @@
  *
  * @requires $scope
  * @requires $location
+ * @requires Notification
+ * @requires translate
  * @requires ApiErrorHandler
  * @requires Product
  * @requires Repository
@@ -16,8 +18,8 @@
  *   Provides the functionality for manipulating repositories attached to a product.
  */
 angular.module('Bastion.products').controller('ProductRepositoriesController',
-    ['$scope', '$state', '$location', 'ApiErrorHandler', 'Product', 'Repository', 'RepositoryBulkAction', 'CurrentOrganization', 'Nutupane',
-    function ($scope, $state, $location, ApiErrorHandler, Product, Repository, RepositoryBulkAction, CurrentOrganization, Nutupane) {
+    ['$scope', '$state', '$location', 'Notification', 'translate', 'ApiErrorHandler', 'Product', 'Repository', 'RepositoryBulkAction', 'CurrentOrganization', 'Nutupane',
+    function ($scope, $state, $location, Notification, translate, ApiErrorHandler, Product, Repository, RepositoryBulkAction, CurrentOrganization, Nutupane) {
         var repositoriesNutupane = new Nutupane(Repository, {
             'product_id': $scope.$stateParams.productId,
             'search': $location.search().search || "",
@@ -35,8 +37,6 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             };
         }
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
         $scope.page = $scope.page || {loading: false};
 
         $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
@@ -46,13 +46,6 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
 
-        $scope.close = function(index) {
-            $scope.removingTasks.splice(index, 1);
-        };
-
-
-        $scope.removingTasks = [];
-
         $scope.table = repositoriesNutupane.table;
 
         $scope.syncSelectedRepositories = function () {
@@ -62,7 +55,9 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
                 $state.go('product.tasks.details', {taskId: task.id});
             },
             function (response) {
-                $scope.errorMessages = response.data.errors;
+                angular.forEach(response.data.errors, function (error) {
+                    Notification.setErrorMessage(error);
+                });
             });
         };
 
@@ -70,11 +65,17 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             var success, error, params = getParams(), removalPromise;
 
             success = function (response) {
-                $scope.removingTasks.push(response.task.id);
+                var message = translate('Removal of selected repositories initiated successfully. ');
+
+                message += translate('<a href="/foreman_tasks/tasks/%taskId">Click here to check the status of the task.</a>').
+                    replace('%taskId', response.task.id);
+                Notification.setSuccessMessage(message);
             };
 
             error = function (response) {
-                $scope.errorMessages = response.data.errors;
+                angular.forEach(response.data.errors, function (errorMessage) {
+                    Notification.setErrorMessage(errorMessage);
+                });
             };
 
             $scope.removingRepositories = true;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-advanced-sync.controller.js

@@ -4,16 +4,19 @@
  *
  * @requires $scope
  * @requires $state
+ * @requires Notification
  * @requires Repository
  *
  * @description
  *   Provides the functionality for advanced repository syncing
  */
 angular.module('Bastion.repositories').controller('RepositoryAdvancedSyncController',
-    ['$scope', '$state', 'Repository',
-    function ($scope, $state, Repository) {
+    ['$scope', '$state', 'Notification', 'Repository',
+    function ($scope, $state, Notification, Repository) {
         var errorHandler = function errorHandler(response) {
-            $scope.errorMessages = response.data.errors;
+            angular.forEach(response.data.errors, function (error) {
+                Notification.setErrorMessage(error);
+            });
             $scope.working = false;
         };
 

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

@@ -5,7 +5,7 @@
  * @requires $scope
  * @requires $q
  * @requires translate
- * @requires GlobalNotification
+ * @requires Notification
  * @requires GPGKey
  * @requires CurrentOrganization
  * @requires Checksum
@@ -17,14 +17,14 @@
  *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$q', 'translate', 'GlobalNotification', 'GPGKey', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture',
-    function ($scope, $q, translate, GlobalNotification, GPGKey, CurrentOrganization, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture) {
+    ['$scope', '$q', 'translate', 'Notification', 'GPGKey', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture',
+    function ($scope, $q, translate, Notification, GPGKey, CurrentOrganization, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture) {
         $scope.organization = CurrentOrganization;
 
         $scope.progress = {uploading: false};
 
         $scope.repository.$promise.then(function () {
-            $scope.uploadURL = '/katello/api/v2/repositories/' + $scope.repository.id + '/upload_content';
+            $scope.uploadURL = 'katello/api/v2/repositories/' + $scope.repository.id + '/upload_content';
         });
 
         $scope.gpgKeys = function () {
@@ -62,11 +62,11 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             repository.$update(function (response) {
                 deferred.resolve(response);
-                GlobalNotification.setSuccessMessage(translate('Repository Saved.'));
+                Notification.setSuccessMessage(translate('Repository Saved.'));
             }, function (response) {
                 deferred.reject(response);
                 _.each(response.data.errors, function (errorMessage) {
-                    GlobalNotification.setErrorMessage(translate("An error occurred saving the Repository: ") + errorMessage);
+                    Notification.setErrorMessage(translate("An error occurred saving the Repository: ") + errorMessage);
                 });
             });
 
@@ -89,11 +89,11 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
                 if (returnData !== null && returnData.status === 'success') {
                     uploaded = returnData.filenames.join(', ');
-                    GlobalNotification.setSuccessMessage(translate('Successfully uploaded content: ') + uploaded);
+                    Notification.setSuccessMessage(translate('Successfully uploaded content: ') + uploaded);
                     $scope.repository.$get();
                 } else {
                     error = returnData.displayMessage;
-                    GlobalNotification.setErrorMessage(translate('Error during upload: ') + error);
+                    Notification.setErrorMessage(translate('Error during upload: ') + error);
                 }
 
                 $scope.progress.uploading = false;
@@ -106,7 +106,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
             } else {
                 error = content;
             }
-            GlobalNotification.setErrorMessage(translate('Error during upload: ') + error);
+            Notification.setErrorMessage(translate('Error during upload: ') + error);
             $scope.progress.uploading = false;
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js

@@ -5,6 +5,7 @@
  * @requires $scope
  * @requries $state
  * @requires translate
+ * @requires Notification
  * @requires Nutupane
  * @requires Repository
  * @requires Package
@@ -17,8 +18,8 @@
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'OstreeBranch', 'File',
-    function ($scope, $state, translate, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, OstreeBranch, File) {
+    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'OstreeBranch', 'File',
+    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, OstreeBranch, File) {
         var currentState, contentTypes;
 
         function success(response, selected) {
@@ -32,13 +33,13 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
             } else {
                 message = translate("Successfully removed %s items.").replace('%s', selected.length);
             }
-            $scope.successMessages = [message];
+            Notification.setSuccessMessage(message);
             $scope.generationTaskId = response.output['task_id'];
         }
 
         function error(data) {
             $scope.table.working = true;
-            $scope.errorMessages = [data.response.displayMessage];
+            Notification.setErrorMessage(data.response.displayMessage);
         }
 
         $scope.repository = Repository.get({id: $scope.$stateParams.repositoryId}, function (repository) {

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

@@ -1,5 +1,5 @@
 (function () {
-    function RepositoryDetailsController($scope, $state, translate, Repository, Product, ApiErrorHandler) {
+    function RepositoryDetailsController($scope, $state, translate, Repository, Product, ApiErrorHandler, Notification) {
         /**
          * @ngdoc object
          * @name  Bastion.repositories.controller:RepositoryDetailsController
@@ -9,18 +9,18 @@
          * @requires translate
          * @requires Repository
          * @requires ApiErrorHandler
+         * @requires Notification
          *
          * @description
          *   Core functionality for Repository.
          */
 
         var errorHandler = function errorHandler(response) {
-            $scope.errorMessages = response.data.errors;
+            angular.forEach(response.data.errors, function (error) {
+                Notification.setErrorMessage(error);
+            });
         };
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.page = {
             error: false,
             loading: true
@@ -84,7 +84,7 @@
 
             success = function () {
                 $scope.transitionTo('product.repositories', {productId: $scope.$stateParams.productId});
-                $scope.$parent.successMessages = [translate('Repository "%s" successfully deleted').replace('%s', repositoryName)];
+                Notification.setSuccessMessage(translate('Repository "%s" successfully deleted').replace('%s', repositoryName));
             };
 
             repository.$delete(success, errorHandler);
@@ -112,5 +112,5 @@
 
     angular.module('Bastion.repositories').controller('RepositoryDetailsController', RepositoryDetailsController);
 
-    RepositoryDetailsController.$inject = ['$scope', '$state', 'translate', 'Repository', 'Product', 'ApiErrorHandler'];
+    RepositoryDetailsController.$inject = ['$scope', '$state', 'translate', 'Repository', 'Product', 'ApiErrorHandler', 'Notification'];
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync.html

@@ -3,8 +3,6 @@
 <div>
   <h3 translate>Advanced Sync</h3>
 
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <div data-extend-template="products/details/repositories/details/views/repository-advanced-sync-options.html"></div>
 
   <div class="control-group buttons">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -270,8 +270,6 @@
       <h5 translate ng-show="repository.content_type === 'yum'">Upload Package</h5>
       <h5 translate ng-show="repository.content_type === 'file'">Upload File</h5>
 
-      <div bst-alerts success-messages="uploadSuccessMessages" error-messages="uploadErrorMessages"></div>
-
       <form role="form"
             action="{{ uploadURL }}"
             ng-upload="uploadContent(content)"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html

@@ -1,8 +1,6 @@
 <span page-title ng-model="repository">{{ 'Manage Docker Manifests for Repository:' | translate }} {{ repository.name }}</span>
 
 <div data-block="messages">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <div bst-alert="success" ng-hide="generationTaskId === undefined">
     <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
     <p translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-files.html

@@ -1,8 +1,6 @@
 <span page-title ng-model="repository">{{ 'Manage Files for Repository:' | translate }} {{ repository.name }}</span>
 
 <div data-block="messages">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <div bst-alert="success" ng-hide="generationTaskId === undefined">
     <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
     <p translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ostree-branches.html

@@ -1,8 +1,6 @@
 <span page-title ng-model="repository">{{ 'Manage OSTree Branches for Repository:' | translate }} {{ repository.name }}</span>
 
 <div data-block="messages">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <div bst-alert="success" ng-hide="generationTaskId === undefined">
     <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
     <p translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-packages.html

@@ -1,8 +1,6 @@
 <span page-title ng-model="repository">{{ 'Manage Packages for Repository:' | translate }} {{ repository.name }}</span>
 
 <div data-block="messages">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <div bst-alert="success" ng-hide="generationTaskId === undefined">
     <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
     <p translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-puppet-modules.html

@@ -3,8 +3,6 @@
 <h3 translate>Manage Puppet Modules for {{ repository.name }}</h3>
 
 <div data-block="messages">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <div bst-alert="success" ng-hide="generationTaskId === undefined">
     <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
     <p translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -8,7 +8,7 @@
  * @requires GPGKey
  * @requires FormUtils
  * @requires translate
- * @requires GlobalNotification
+ * @requires Notification
  * @requires ApiErrorHandler
  * @requires BastionConfig
  * @requires Checksum
@@ -20,11 +20,11 @@
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', 'Repository', 'Product', 'GPGKey', 'FormUtils', 'translate', 'GlobalNotification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture',
-    function ($scope, Repository, Product, GPGKey, FormUtils, translate, GlobalNotification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture) {
+    ['$scope', 'Repository', 'Product', 'GPGKey', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture',
+    function ($scope, Repository, Product, GPGKey, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture) {
 
         function success() {
-            GlobalNotification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
+            Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
             $scope.transitionTo('product.repositories', {productId: $scope.$stateParams.productId});
         }
 
@@ -48,7 +48,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             });
 
             if (!foundError) {
-                GlobalNotification.setErrorMessage(response.data.displayMessage);
+                Notification.setErrorMessage(response.data.displayMessage);
             }
         }
 
@@ -57,9 +57,6 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             loading: true
         };
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
             'checksum_type': null, 'mirror_on_sync': true, 'verify_ssl_on_sync': true,
             'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -2,8 +2,6 @@
 
 <h3 translate>New Repository</h3>
 
-<div bst-alerts error-messages="errorMessages" success-messages="successMessages"></div>
-
 <div data-block="content" class="row">
   <form name="repositoryForm" class="col-sm-5" novalidate role="form">
     <div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository.factory.js

@@ -12,7 +12,7 @@ angular.module('Bastion.repositories').factory('Repository',
     ['BastionResource', 'CurrentOrganization',
     function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/repositories/:id/:action',
+        return BastionResource('katello/api/v2/repositories/:id/:action',
             {id: '@id', 'organization_id': CurrentOrganization},
             {
                 update: { method: 'PUT' },
@@ -41,7 +41,7 @@ angular.module('Bastion.repositories').factory('Repository',
 angular.module('Bastion.repositories').factory('RepositoryBulkAction',
     ['BastionResource', 'CurrentOrganization', function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/repositories/bulk/:action',
+        return BastionResource('katello/api/v2/repositories/bulk/:action',
             {'organization_id': CurrentOrganization},
             {
                 removeRepositories: {method: 'PUT', params: {action: 'destroy'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html

@@ -1,25 +1,5 @@
 <span page-title ng-model="product">{{ 'Repositories for Product:' | translate }} {{ product.name }}</span>
 
-<div data-block="messages">
-  <div bst-alert="success" ng-show="removingTasks.length > 0" close="close($index)" ng-repeat="task in removingTasks">
-    <div>
-      <p translate>Removal of selected repositories initiated successfully. </p>
-      <div><a href="/foreman_tasks/tasks/{{task}}" translate>Click here to check the status of the task.</a></div>
-    </div>
-  </div>
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-  <div bst-alert="danger" ng-show="warningMessages">
-    <strong translate>There were errors while removing the following Repositories:</strong>
-    <ol>
-      <li data-ng-repeat="message in warningMessages">
-        {{ message }}
-      </li>
-    </ol>
-    <a ui-sref="product.tasks.details({taskId: warningTaskId})" translate>Click here to see the task for the successful removals.</a>
-  </div>
-</div>
-
-
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
     <button type="button" class="btn btn-default"