katello 3.5.0.rc1 → 3.5.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/rule.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.content-views').factory('Rule',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/v2/content_view_filters/:filterId/rules/:ruleId',
+        return BastionResource('katello/api/v2/content_view_filters/:filterId/rules/:ruleId',
             {ruleId: '@id', filterId: '@content_view_filter_id'},
             {
                 update: {method: 'PUT'}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.factory.js

@@ -12,7 +12,7 @@ angular.module('Bastion.content-views').factory('ContentViewHistory',
     ['BastionResource', 'CurrentOrganization',
     function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/content_views/:contentViewId/history/:action',
+        return BastionResource('katello/api/v2/content_views/:contentViewId/history/:action',
             {id: '@id', contentViewId: '@contentViewId', 'organization_id': CurrentOrganization},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {action: 'auto_complete_search'}}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-versions.controller.js

@@ -7,14 +7,14 @@
  * @requires Nutupane
  * @requires ContentView
  * @requires ContentViewPuppetModule
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Provides the ability to select a version of a Puppet Module for a Content View.
  */
 angular.module('Bastion.content-views').controller('ContentViewPuppetModuleVersionsController',
-    ['$scope', 'translate', 'Nutupane', 'ContentView', 'ContentViewPuppetModule', 'GlobalNotification',
-    function ($scope, translate, Nutupane, ContentView, ContentViewPuppetModule, GlobalNotification) {
+    ['$scope', 'translate', 'Nutupane', 'ContentView', 'ContentViewPuppetModule', 'Notification',
+    function ($scope, translate, Nutupane, ContentView, ContentViewPuppetModule, Notification) {
         var success, error, nutupane, params;
 
         params = {
@@ -49,12 +49,12 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModuleVersi
         success = function () {
             $scope.transitionTo('content-view.puppet-modules.list',
                 {contentViewId: $scope.$stateParams.contentViewId});
-            GlobalNotification.setSuccessMessage(translate('Puppet module added to Content View'));
+            Notification.setSuccessMessage(translate('Puppet module added to Content View'));
         };
 
         error = function (response) {
             angular.forEach(response.data.errors, function (errorMessage) {
-                GlobalNotification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
+                Notification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
             });
         };
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module.factory.js

@@ -12,7 +12,7 @@ angular.module('Bastion.content-views').factory('ContentViewPuppetModule',
     ['BastionResource', 'CurrentOrganization',
     function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/content_views/:contentViewId/content_view_puppet_modules/:id/:action',
+        return BastionResource('katello/api/v2/content_views/:contentViewId/content_view_puppet_modules/:id/:action',
             {id: '@id', contentViewId: '@contentViewId', 'organization_id': CurrentOrganization},
             {
                 update: {method: 'PUT'},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-modules.controller.js

@@ -6,14 +6,14 @@
  * @requires translate
  * @requires Nutupane
  * @requires ContentViewPuppetModule
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Provides functionality to the Content View existing Puppet Modules list.
  */
 angular.module('Bastion.content-views').controller('ContentViewPuppetModulesController',
-    ['$scope', 'translate', 'Nutupane', 'ContentViewPuppetModule', 'GlobalNotification',
-    function ($scope, translate, Nutupane, ContentViewPuppetModule, GlobalNotification) {
+    ['$scope', 'translate', 'Nutupane', 'ContentViewPuppetModule', 'Notification',
+    function ($scope, translate, Nutupane, ContentViewPuppetModule, Notification) {
         var nutupane = new Nutupane(ContentViewPuppetModule, {
             contentViewId: $scope.$stateParams.contentViewId
         });
@@ -49,14 +49,14 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModulesCont
             var success, error;
 
             success = function () {
-                GlobalNotification.setSuccessMessage(translate('Module %s removed from Content View.')
+                Notification.setSuccessMessage(translate('Module %s removed from Content View.')
                     .replace('%s', module.name));
                 nutupane.removeRow(module.id);
             };
 
             error = function (response) {
                 angular.forEach(response.data.errors, function (errorMessage) {
-                    GlobalNotification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
+                    Notification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
                 });
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version.factory.js

@@ -11,7 +11,7 @@
 angular.module('Bastion.content-views.versions').factory('ContentViewVersion',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/v2/content_view_versions/:id/:action',
+        return BastionResource('katello/api/v2/content_view_versions/:id/:action',
             {id: '@id'},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifest.factory.js

@@ -9,7 +9,7 @@
      *   Provides a BastionResource for interacting with Docker Manifests
      */
     function DockerManifest(BastionResource) {
-        return BastionResource('/katello/api/v2/docker_manifests/:id',
+        return BastionResource('katello/api/v2/docker_manifests/:id',
             {'id': '@id'}
         );
     }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-details.controller.js

@@ -14,9 +14,6 @@
 angular.module('Bastion.docker-tags').controller('DockerTagDetailsController',
     ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization', 'ApiErrorHandler',
     function ($scope, $location, Nutupane, DockerTag, CurrentOrganization, ApiErrorHandler) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.panel = {
             error: false,
             loading: true

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-details.html

@@ -1,8 +1,6 @@
 <span page-title ng-model="tag">{{ 'Details for Docker Tag:' | translate }} {{ tag.full_name }}</span>
 
 <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>{{ tag.full_name }}</h2>
   </header>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.factory.js

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment.controller.js

@@ -8,11 +8,9 @@
      * @description
      *   Enter a description!
      */
-    function EnvironmentController($scope, Environment, translate, ContentService, ApiErrorHandler) {
+    function EnvironmentController($scope, Environment, translate, ContentService, ApiErrorHandler, Notification) {
 
         $scope.contentTypes = ContentService.contentTypes;
-        $scope.errorMessages = [];
-        $scope.successMessages = [];
         $scope.panel = {
             error: false,
             loading: true
@@ -29,12 +27,12 @@
             var promise;
 
             function success() {
-                $scope.successMessages.push(translate('Environment saved'));
+                Notification.setSuccessMessage(translate('Environment saved'));
             }
 
             function error(response) {
                 angular.forEach(response.data.errors, function (errorMessage) {
-                    $scope.errorMessages.push(translate("An error occurred saving the Environment: ") + errorMessage);
+                    Notification.setErrorMessage((translate("An error occurred saving the Environment: ") + errorMessage));
                 });
             }
 
@@ -48,12 +46,12 @@
             var promise;
 
             function success() {
-                $scope.successMessages.push(translate('Remove Successful.'));
+                Notification.setSuccessMessage(translate('Remove Successful.'));
                 $scope.transitionTo('environments');
             }
 
             function error(response) {
-                $scope.errorMessages.push(translate("An error occurred removing the environment: ") +
+                Notification.setErrorMessage(translate("An error occurred removing the environment: ") +
                     response.data.displayMessage);
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environment.factory.js

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/new-environment.controller.js

@@ -8,7 +8,7 @@
      * @description
      *   Handles creating a new environment.
      */
-    function NewEnvironmentController($scope, Environment, FormUtils) {
+    function NewEnvironmentController($scope, Environment, FormUtils, Notification) {
 
         function success() {
             $scope.transitionTo('environments');
@@ -21,14 +21,11 @@
                     $scope.environmentForm[field].$setValidity('server', false);
                     $scope.environmentForm[field].$error.messages = errors;
                 } else {
-                    $scope.errorMessages.push(errors);
+                    Notification.setErrorMessage(errors);
                 }
             });
         }
 
-        $scope.errorMessages = [];
-        $scope.successMessages = [];
-
         $scope.loading = true;
         $scope.environment = new Environment();
         $scope.priorEnvironment = Environment.get({id: $scope.$stateParams.priorId});
@@ -55,6 +52,6 @@
         .module('Bastion.environments')
         .controller('NewEnvironmentController', NewEnvironmentController);
 
-    NewEnvironmentController.$inject = ['$scope', 'Environment', 'FormUtils'];
+    NewEnvironmentController.$inject = ['$scope', 'Environment', 'FormUtils', 'Notification'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/new-environment.html

@@ -18,8 +18,6 @@
     <h1 translate>New Environment</h1>
   </header>
 
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <div ng-show="priorEnvironment.successor && !loading">
     <p translate>Lifecycle Environment "{{ priorEnvironment.name }}" exists within the middle of a path. New Lifecycle Environments can only be added to the end of a path.</p>
   </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -8,13 +8,14 @@
  * @requires ContentHostBulkAction
  * @requires ContentViewVersion
  * @requires CurrentOrganization
+ * @requires Notification
  *
  * @description
  *   Display confirmation screen and apply Errata.
  */
 angular.module('Bastion.errata').controller('ApplyErrataController',
-    ['$scope', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization',
-        function ($scope, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization) {
+    ['$scope', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization', 'Notification',
+        function ($scope, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization, Notification) {
             var applyErrata, incrementalUpdate;
 
             function transitionToTask(task) {
@@ -86,7 +87,9 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 }
 
                 error = function (response) {
-                    $scope.errorMessages = response.data.errors;
+                    angular.forEach(response.data.errors, function (responseError) {
+                        Notification.setErrorMessage(responseError);
+                    });
                     $scope.applyingErrata = false;
                 };
 
@@ -103,7 +106,9 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 params['organization_id'] = CurrentOrganization;
 
                 error = function (response) {
-                    $scope.errorMessages = response.data.errors;
+                    angular.forEach(response.data.errors, function (responseError) {
+                        Notification.setErrorMessage(responseError);
+                    });
                     $scope.applyingErrata = false;
                 };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/erratum-content-hosts.controller.js

@@ -19,9 +19,6 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             'overrideAutoLoad': true
         };
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.restrictInstallable = false;
 
         params = {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/erratum.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.errata').factory('Erratum',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/v2/errata/:id/',
+        return BastionResource('katello/api/v2/errata/:id/',
             {id: '@id', 'sort_by': 'issued', 'sort_order': 'DESC'},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

@@ -1,7 +1,5 @@
 <span page-title>{{ 'Apply Errata' | translate }}</span>
 
-<div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
 <section class="col-md-4" ng-hide="selectedContentHosts">
   <p bst-alert="warning">
     <span translate>You must select at least one Content Host in order to apply Errata.</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file.controller.js

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/file.factory.js

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

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

@@ -5,12 +5,13 @@
  * @requires $scope
  * @requires GPGKey
  * @requires translate
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the gpgKey details action pane.
  */
 angular.module('Bastion.gpg-keys').controller('GPGKeyDetailsInfoController',
-    ['$scope', 'GPGKey', 'translate', function ($scope, GPGKey, translate) {
+    ['$scope', 'GPGKey', 'translate', 'Notification', function ($scope, GPGKey, translate, Notification) {
 
         $scope.panel = $scope.panel || {loading: false};
         $scope.progress = {uploading: false};
@@ -20,17 +21,17 @@ angular.module('Bastion.gpg-keys').controller('GPGKeyDetailsInfoController',
         });
 
         $scope.gpgKey.$promise.then(function () {
-            $scope.uploadURL = '/katello/api/v2/gpg_keys/' + $scope.gpgKey.id + '/content';
+            $scope.uploadURL = 'katello/api/v2/gpg_keys/' + $scope.gpgKey.id + '/content';
         });
 
         $scope.uploadContent = function (content) {
             if (content && (content !== "Please wait...")) {
                 if (content.status === 'success') {
-                    $scope.$parent.successMessages = [translate('GPG Key successfully uploaded')];
+                    Notification.setSuccessMessage(translate('GPG Key successfully uploaded'));
                     $scope.uploadStatus = 'success';
                     $scope.gpgKey.$get();
                 } else {
-                    $scope.$parent.errorMessages = [content.displayMessage];
+                    Notification.setErrorMessage(content.displayMessage);
                     $scope.uploadStatus = 'error';
                 }
 
@@ -44,7 +45,7 @@ angular.module('Bastion.gpg-keys').controller('GPGKeyDetailsInfoController',
             } else {
                 error = content;
             }
-            $scope.$parent.errorMessages = [translate('Error during upload: ') + error];
+            Notification.setErrorMessage(translate('Error during upload: ') + error);
             $scope.uploadStatus = 'error';
             $scope.progress.uploading = false;
         };

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

@@ -7,15 +7,13 @@
  * @requires $q
  * @requires translate
  * @requires ApiErrorHandler
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the gpgKey details action pane.
  */
 angular.module('Bastion.gpg-keys').controller('GPGKeyDetailsController',
-    ['$scope', 'GPGKey', '$q', 'translate', 'ApiErrorHandler', function ($scope, GPGKey, $q, translate, ApiErrorHandler) {
-        $scope.errorMessages = [];
-        $scope.successMessages = [];
-
+    ['$scope', 'GPGKey', '$q', 'translate', 'ApiErrorHandler', 'Notification', function ($scope, GPGKey, $q, translate, ApiErrorHandler, Notification) {
         $scope.panel = $scope.panel || {error: false, loading: false};
 
         $scope.gpgKey = GPGKey.get({id: $scope.$stateParams.gpgKeyId}, function () {
@@ -31,11 +29,11 @@ angular.module('Bastion.gpg-keys').controller('GPGKeyDetailsController',
 
             gpgKey.$update(function (response) {
                 deferred.resolve(response);
-                $scope.successMessages.push(translate('GPG Key updated'));
+                Notification.setSuccessMessage(translate('GPG Key updated'));
 
             }, function (response) {
                 deferred.reject(response);
-                $scope.errorMessages = [response.data.displayMessage];
+                Notification.setErrorMessage(response.data.displayMessage);
             });
 
             return deferred.promise;

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

@@ -11,7 +11,7 @@ angular.module('Bastion.gpg-keys').factory('GPGKey',
     ['BastionResource', 'CurrentOrganization',
     function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/gpg_keys/:id/:action',
+        return BastionResource('katello/api/v2/gpg_keys/:id/:action',
             {id: '@id', 'organization_id': CurrentOrganization},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/new/new-gpg-key.controller.js

@@ -7,31 +7,28 @@
  * @requires translate
  * @requires GPGKey
  * @requires CurrentOrganization
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Controls the creation of an empty GPGKey object for use by sub-controllers.
  */
 angular.module('Bastion.gpg-keys').controller('NewGPGKeyController',
-    ['$scope', '$state', 'translate', 'GPGKey', 'CurrentOrganization', 'GlobalNotification',
-    function ($scope, $state, translate, GPGKey, CurrentOrganization, GlobalNotification) {
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
+    ['$scope', '$state', 'translate', 'GPGKey', 'CurrentOrganization', 'Notification',
+    function ($scope, $state, translate, GPGKey, CurrentOrganization, Notification) {
         $scope.panel = {loading: false};
         $scope.gpgKey = new GPGKey();
         $scope.CurrentOrganization = CurrentOrganization;
         $scope.progress = {uploading: false};
-        $scope.uploadURL = '/katello/api/v2/gpg_keys?organization_id=' + CurrentOrganization;
+        $scope.uploadURL = 'katello/api/v2/gpg_keys?organization_id=' + CurrentOrganization;
 
         $scope.uploadContent = function (response) {
             if (response) {
                 if (angular.isUndefined(response.errors)) {
                     $scope.uploadStatus = 'success';
                     $scope.transitionTo('gpg-key.info', {gpgKeyId: response.id});
-                    GlobalNotification.setSuccessMessage(translate('GPG key %s has been created.').replace('%s', response.name));
+                    Notification.setSuccessMessage(translate('GPG key %s has been created.').replace('%s', response.name));
                 } else {
-                    $scope.errorMessages = [translate("An error occurred while creating the GPG key: ") + response.displayMessage];
+                    Notification.setErrorMessage(translate("An error occurred while creating the GPG key: ") + response.displayMessage);
                     $scope.uploadStatus = 'error';
                 }