katello 3.5.0.rc1 → 3.5.0.rc2

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

@@ -1,5 +1,4 @@
 <span page-title ng-model="product">{{ 'Product information for:' | translate }} {{ product.name }}</span>
-<div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
 <div data-extend-template="layouts/two-column-details.html">
   <div data-block="left-column">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-create.controller.js

@@ -4,6 +4,7 @@
  *
  * @requires $scope
  * @requires $q
+ * @requires Notification
  * @requires CurrentOrganization
  * @requires Product
  * @requires Repository
@@ -17,11 +18,8 @@
  *      repository discovery.
  */
 angular.module('Bastion.products').controller('DiscoveryCreateController',
-    ['$scope', '$q', 'CurrentOrganization', 'Product', 'Repository', 'GPGKey', 'FormUtils', 'DiscoveryRepositories', 'translate', 'ApiErrorHandler',
-    function ($scope, $q, CurrentOrganization, Product, Repository, GPGKey, FormUtils, DiscoveryRepositories, translate, ApiErrorHandler) {
-
-        $scope.errorMessages = [];
-        $scope.successMessages = [];
+    ['$scope', '$q', 'Notification', 'CurrentOrganization', 'Product', 'Repository', 'GPGKey', 'FormUtils', 'DiscoveryRepositories', 'translate', 'ApiErrorHandler',
+    function ($scope, $q, Notification, CurrentOrganization, Product, Repository, GPGKey, FormUtils, DiscoveryRepositories, translate, ApiErrorHandler) {
 
         $scope.table = {
             rows: DiscoveryRepositories.getRows(),
@@ -100,7 +98,7 @@ angular.module('Bastion.products').controller('DiscoveryCreateController',
         function productCreateError(response) {
             $scope.createRepoChoices.creating = false;
             angular.forEach(response.data.errors, function (errors, field) {
-                $scope.errorMessages.push(translate('An error occurred while creating the Product: %s').replace('%s', field + ' ' + errors));
+                Notification.setErrorMessage(translate('An error occurred while creating the Product: %s').replace('%s', field + ' ' + errors));
                 if (!angular.isUndefined($scope.productForm[field])) {
                     $scope.productForm[field].$error.messages = errors;
                 }

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

@@ -6,6 +6,7 @@
  * @requires $q
  * @requires $timeout
  * @requires $http
+ * @requires Notification
  * @requires Task
  * @requires Organization
  * @requires CurrentOrganization
@@ -16,13 +17,10 @@
  *   Provides the functionality for the repo discovery action pane.
  */
 angular.module('Bastion.products').controller('DiscoveryController',
-    ['$scope', '$q', '$timeout', '$http', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'translate',
-    function ($scope, $q, $timeout, $http, Task, Organization, CurrentOrganization, DiscoveryRepositories, translate) {
+    ['$scope', '$q', '$timeout', '$http', 'Notification', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'translate',
+    function ($scope, $q, $timeout, $http, Notification, Task, Organization, CurrentOrganization, DiscoveryRepositories, translate) {
         var transformRows, setDiscoveryDetails;
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.discovery = {
             url: '',
             contentType: 'yum'
@@ -119,7 +117,7 @@ angular.module('Bastion.products').controller('DiscoveryController',
                     $scope.discovery.working = false;
                     Task.unregisterSearch($scope.taskSearchId);
                     if (task.result === "error") {
-                        $scope.errorMessages = [translate("Discovery failed. Error: %s").replace('%s', task.humanized.errors[0])];
+                        Notification.setErrorMessage(translate("Discovery failed. Error: %s").replace('%s', task.humanized.errors[0]));
                     }
                 }
             }
@@ -137,8 +135,7 @@ angular.module('Bastion.products').controller('DiscoveryController',
                 'upstream_username': $scope.discovery.upstreamUsername,
                 'upstream_password': $scope.discovery.upstreamPassword
             };
-            $scope.successMessages = [];
-            $scope.errorMessages = [];
+
             Organization.repoDiscover(params, function (task) {
                 $scope.taskSearchId = Task.registerSearch({ 'type': 'task', 'task_id': task.id }, $scope.updateTask);
             });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-base.html

@@ -1,6 +1,4 @@
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
-  <div ng-show="page.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <header data-block="header">
     <h2 translate>Repository Discovery</h2>
   </header>

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

@@ -17,8 +17,8 @@
  *   within the table.
  */
 angular.module('Bastion.products').controller('ProductFormController',
-    ['$scope', '$q', '$uibModal', 'Product', 'GPGKey', 'SyncPlan', 'FormUtils', 'GlobalNotification',
-    function ($scope, $q, $uibModal, Product, GPGKey, SyncPlan, FormUtils, GlobalNotification) {
+    ['$scope', '$q', '$uibModal', 'Product', 'GPGKey', 'SyncPlan', 'FormUtils', 'Notification',
+    function ($scope, $q, $uibModal, Product, GPGKey, SyncPlan, FormUtils, Notification) {
 
         function fetchGpgKeys() {
             return GPGKey.queryUnpaged(function (gpgKeys) {
@@ -43,7 +43,7 @@ angular.module('Bastion.products').controller('ProductFormController',
                     $scope.productForm[field].$setValidity('server', false);
                     $scope.productForm[field].$error.messages = errors;
                 } else {
-                    GlobalNotification.setErrorMessage("An error occurred while saving the Product: " + field + " " + errors);
+                    Notification.setErrorMessage("An error occurred while saving the Product: " + field + " " + errors);
                 }
             });
         }

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

@@ -10,7 +10,7 @@
 angular.module('Bastion.products').factory('Product',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/v2/products/:id/:action', {id: '@id'}, {
+        return BastionResource('katello/api/v2/products/:id/:action', {id: '@id'}, {
             update: { method: 'PUT'},
             sync: { method: 'POST', params: { action: 'sync' }},
             updateSyncPlan: { method: 'POST', params: { action: 'sync_plan' }},

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

@@ -19,8 +19,8 @@
  *   within the table.
  */
 angular.module('Bastion.products').controller('ProductsController',
-    ['$scope', '$state', '$sce', '$location', '$uibModal', 'translate', 'Nutupane', 'Product', 'ProductBulkAction', 'CurrentOrganization', 'GlobalNotification',
-    function ($scope, $state, $sce, $location, $uibModal, translate, Nutupane, Product, ProductBulkAction, CurrentOrganization, GlobalNotification) {
+    ['$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, taskUrl, taskLink, getBulkParams, bulkError, params;
 
         getBulkParams = function () {
@@ -32,7 +32,7 @@ angular.module('Bastion.products').controller('ProductsController',
 
         bulkError = function (response) {
             angular.forEach(response.data.errors, function(message) {
-                GlobalNotification.setErrorMessage(translate("An error occurred: ") + message);
+                Notification.setErrorMessage(translate("An error occurred: ") + message);
             });
 
             nutupane.refresh();
@@ -58,7 +58,7 @@ angular.module('Bastion.products').controller('ProductsController',
             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.");
-            GlobalNotification.setRenderedSuccessMessage(message.replace("%", taskLink));
+            Notification.setRenderedSuccessMessage(message.replace("%", taskLink));
         });
 
         $scope.unsetProductDeletionTaskId = function () {
@@ -89,7 +89,7 @@ angular.module('Bastion.products').controller('ProductsController',
                 message = translate("Product sync has been initiated in the background. " +
                     "Click %s to monitor the progress.");
 
-                GlobalNotification.setRenderedSuccessMessage(message.replace('%s', taskLink));
+                Notification.setRenderedSuccessMessage(message.replace('%s', taskLink));
             };
 
             ProductBulkAction.syncProducts(getBulkParams(), success, bulkError);
@@ -130,11 +130,11 @@ angular.module('Bastion.products').controller('ProductsController',
 
             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.refresh();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/puppet-module.controller.js

@@ -8,9 +8,6 @@
      *   Provides the functionality for the puppet modules details action pane.
      */
     function PuppetModuleController($scope, PuppetModule, ApiErrorHandler) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.panel = {
             error: false,
             loading: true

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-module.factory.js

@@ -10,7 +10,7 @@
      */
     function PuppetModule(BastionResource) {
 
-        return BastionResource('/katello/api/v2/puppet_modules/:id',
+        return BastionResource('katello/api/v2/puppet_modules/:id',
             {'id': '@id'},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/repository-set.factory.js

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.repository-sets').factory('RepositorySet',
     ['BastionResource', function (BastionResource) {
-        return BastionResource('/katello/api/v2/repository_sets/:id/:action', {id: '@id'}, {
+        return BastionResource('katello/api/v2/repository_sets/:id/:action', {id: '@id'}, {
         });
 
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/setting.factory.js

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.settings').factory('Setting',
     ['BastionResource', function (BastionResource) {
-        var resource = BastionResource('/api/v2/settings/');
+        var resource = BastionResource('api/v2/settings/');
         return resource;
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js

@@ -13,9 +13,6 @@
 angular.module('Bastion.subscriptions').controller('SubscriptionDetailsController',
     ['$scope', 'translate', 'Subscription', 'ApiErrorHandler',
     function ($scope, translate, Subscription, ApiErrorHandler) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.panel = {
             error: false,
             loading: true

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-details.html

@@ -1,6 +1,4 @@
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <header data-block="header">
     <h2>{{ subscription.name }}</h2>
   </header>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-import.controller.js

@@ -14,8 +14,8 @@
  *   Controls the import of a manifest.
  */
 angular.module('Bastion.subscriptions').controller('ManifestImportController',
-    ['$scope', '$q', 'translate', 'CurrentOrganization', 'Organization', 'Task', 'Subscription', 'GlobalNotification',
-    function ($scope, $q, translate, CurrentOrganization, Organization, Task, Subscription, GlobalNotification) {
+    ['$scope', '$q', 'translate', 'CurrentOrganization', 'Organization', 'Task', 'Subscription', 'Notification',
+    function ($scope, $q, translate, CurrentOrganization, Organization, Task, Subscription, Notification) {
 
         function buildManifestLink(upstream) {
             var url = upstream.webUrl,
@@ -50,7 +50,7 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
 
         $scope.uploadErrorMessages = [];
         $scope.progress = {uploading: false};
-        $scope.uploadURL = '/katello/api/v2/organizations/' + CurrentOrganization + '/subscriptions/upload';
+        $scope.uploadURL = 'katello/api/v2/organizations/' + CurrentOrganization + '/subscriptions/upload';
         $scope.organization = Organization.get({id: CurrentOrganization});
 
         $q.all([$scope.organization.$promise]).then(function () {
@@ -80,7 +80,7 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
                 if (task.humanized.errors.length > 0) {
                     errorMessageWithDetails += ' ' + task.humanized.errors.join(' ');
                 }
-                GlobalNotification.setErrorMessage(errorMessageWithDetails);
+                Notification.setErrorMessage(errorMessageWithDetails);
                 $scope.histories = Subscription.manifestHistory();
             }
         };
@@ -92,7 +92,7 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
                 $scope.unregisterSearch();
                 if ($scope.task.result === 'success') {
                     $scope.refreshOrganizationInfo();
-                    GlobalNotification.setSuccessMessage(translate("Manifest successfully imported."));
+                    Notification.setSuccessMessage(translate("Manifest successfully imported."));
                 } else {
                     $scope.handleTaskErrors(task, translate("Error importing manifest."));
                 }
@@ -117,7 +117,7 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
                 $scope.unregisterSearch();
                 if ($scope.task.result === 'success') {
                     $scope.saveSuccess = true;
-                    GlobalNotification.setSuccessMessage(translate("Manifest successfully deleted."));
+                    Notification.setSuccessMessage(translate("Manifest successfully deleted."));
                     $scope.refreshOrganizationInfo();
                 } else {
                     $scope.handleTaskErrors(task, translate("Error deleting manifest."));
@@ -151,7 +151,7 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
                 $scope.unregisterSearch();
                 if ($scope.task.result === 'success') {
                     $scope.saveSuccess = true;
-                    GlobalNotification.setSuccessMessage(translate("Manifest successfully refreshed."));
+                    Notification.setSuccessMessage(translate("Manifest successfully refreshed."));
                     $scope.refreshOrganizationInfo();
                 } else {
                     $scope.handleTaskErrors(task, translate("Error refreshing manifest."));
@@ -175,11 +175,11 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
             });
 
             deferred = Organization.update(whitelistedOrganizationObject, function () {
-                GlobalNotification.setSuccessMessage(translate('Repository URL updated'));
+                Notification.setSuccessMessage(translate('Repository URL updated'));
                 $scope.refreshOrganizationInfo();
             }, function (response) {
                 angular.forEach(response.data.error['full_messages'], function (message) {
-                    GlobalNotification.setErrorMessage(translate("An error occurred saving the URL: ") + message);
+                    Notification.setErrorMessage(translate("An error occurred saving the URL: ") + message);
                 });
             });
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html

@@ -55,8 +55,6 @@
 </section>
 
 <section>
-  <div bst-alerts error-messages="uploadErrorMessages"></div>
-
   <form role="form"
         action="{{ uploadURL }}"
         ng-upload="uploadManifest(content, completed)"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.factory.js

@@ -11,25 +11,25 @@
 angular.module('Bastion.subscriptions').factory('Subscription', ['BastionResource', 'CurrentOrganization',
 
     function (BastionResource, CurrentOrganization) {
-        return BastionResource('/katello/api/v2/organizations/:org/subscriptions/:id/:action',
+        return BastionResource('katello/api/v2/organizations/:org/subscriptions/:id/:action',
             {org: CurrentOrganization, id: '@id'},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
                 deleteManifest: {
                     method: 'POST',
-                    url: '/katello/api/v2/organizations/:org/subscriptions/delete_manifest',
+                    url: 'katello/api/v2/organizations/:org/subscriptions/delete_manifest',
                     params: {'org': CurrentOrganization}
                 },
 
                 refreshManifest: {
                     method: 'PUT',
-                    url: '/katello/api/v2/organizations/:org/subscriptions/refresh_manifest',
+                    url: 'katello/api/v2/organizations/:org/subscriptions/refresh_manifest',
                     params: {'org': CurrentOrganization}
                 },
 
                 manifestHistory: {
                     method: 'GET',
-                    url: '/katello/api/v2/organizations/:org/subscriptions/:action',
+                    url: 'katello/api/v2/organizations/:org/subscriptions/:action',
                     params: {action: 'manifest_history'},
                     isArray: true
                 }

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

@@ -10,18 +10,16 @@
  * @requires Product
  * @requires CurrentOrganization
  * @requires Nutupane
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for adding products to a sync plan.
  */
 angular.module('Bastion.sync-plans').controller('SyncPlanAddProductsController',
-    ['$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 = [];
-
             params = {
                 'search': $location.search().search || "",
                 'sort_by': 'name',
@@ -48,8 +46,8 @@ angular.module('Bastion.sync-plans').controller('SyncPlanAddProductsController',
                 };
 
                 success = function (response) {
-                    $scope.successMessages = [translate('Added %x products to sync plan "%y".')
-                        .replace('%x', $scope.table.numSelected).replace('%y', $scope.syncPlan.name)];
+                    Notification.setSuccessMessage(translate('Added %x products to sync plan "%y".')
+                        .replace('%x', $scope.table.numSelected).replace('%y', $scope.syncPlan.name));
                     $scope.table.working = false;
                     $scope.table.selectAll(false);
                     productsNutupane.refresh();
@@ -59,7 +57,7 @@ angular.module('Bastion.sync-plans').controller('SyncPlanAddProductsController',
 
                 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/sync-plans/details/sync-plan-details-info.controller.js

@@ -7,15 +7,14 @@
  * @requires translate
  * @requires SyncPlan
  * @requires MenuExpander
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the sync plan details action pane.
  */
 angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
-    ['$scope', '$q', 'translate', 'SyncPlan', 'MenuExpander',
-        function ($scope, $q, translate, SyncPlan, MenuExpander) {
-            $scope.successMessages = [];
-            $scope.errorMessages = [];
+    ['$scope', '$q', 'translate', 'SyncPlan', 'MenuExpander', 'Notification',
+        function ($scope, $q, translate, SyncPlan, MenuExpander, Notification) {
             $scope.intervals = [
                 {id: 'hourly', value: translate('hourly')},
                 {id: 'daily', value: translate('daily')},
@@ -49,14 +48,14 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
                 syncPlan.$update(function (response) {
                     updateSyncPlan(syncPlan);
                     deferred.resolve(response);
-                    $scope.successMessages.push(translate('Sync Plan Saved'));
+                    Notification.setSuccessMessage(translate('Sync Plan Saved'));
                 }, function (response) {
                     deferred.reject(response);
                     angular.forEach(response.data.errors, function (errorMessage, key) {
                         if (angular.isString(key)) {
                             errorMessage = [key, errorMessage].join(' ');
                         }
-                        $scope.errorMessages.push(translate("An error occurred saving the Sync Plan: ") + errorMessage);
+                        Notification.setErrorMessage(translate("An error occurred saving the Sync Plan: ") + errorMessage);
                     });
                 });
 

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

@@ -7,14 +7,14 @@
  * @requires translate
  * @requires SyncPlan
  * @requires ApiErrorHandler
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the sync plan details action pane.
  */
 angular.module('Bastion.sync-plans').controller('SyncPlanDetailsController',
-    ['$scope', '$state', 'translate', 'SyncPlan', 'ApiErrorHandler', 'GlobalNotification',
-        function ($scope, $state, translate, SyncPlan, ApiErrorHandler, GlobalNotification) {
+    ['$scope', '$state', 'translate', 'SyncPlan', 'ApiErrorHandler', 'Notification',
+        function ($scope, $state, translate, SyncPlan, ApiErrorHandler, Notification) {
             $scope.panel = {
                 error: false,
                 loading: true
@@ -35,13 +35,13 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsController',
                 SyncPlan.sync({id: $scope.$stateParams.syncPlanId}, function (task) {
                     $scope.task = task;
                 }, function (response) {
-                    GlobalNotification.setErrorMessage(response.data.errors[0]);
+                    Notification.setErrorMessage(response.data.errors[0]);
                 });
             };
 
             $scope.removeSyncPlan = function (syncPlan) {
                 syncPlan.$remove(function () {
-                    GlobalNotification.setSuccessMessage(translate('Sync Plan %s has been deleted.').replace('%s', syncPlan.name));
+                    Notification.setSuccessMessage(translate('Sync Plan %s has been deleted.').replace('%s', syncPlan.name));
                     $scope.transitionTo('sync-plans');
                 });
             };