katello 3.5.0.rc1 → 3.5.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-subscriptions.controller.js

@@ -9,13 +9,14 @@
  * @requires Subscription
  * @requires ContentHost
  * @requires SubscriptionsHelper
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostSubscription', 'Subscription', 'SubscriptionsHelper',
-    function ($scope, $location, translate, Nutupane, CurrentOrganization, Host, HostSubscription, Subscription, SubscriptionsHelper) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostSubscription', 'Subscription', 'SubscriptionsHelper', 'Notification',
+    function ($scope, $location, translate, Nutupane, CurrentOrganization, Host, HostSubscription, Subscription, SubscriptionsHelper, Notification) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -63,12 +64,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
             HostSubscription.addSubscriptions({id: $scope.$stateParams.hostId, 'subscriptions': selected}, function () {
                 Host.get({id: $scope.$stateParams.hostId}, function (host) {
                     $scope.$parent.host = host;
-                    $scope.successMessages.push(translate("Successfully added %s subscriptions.").replace('%s', selected.length));
+                    Notification.setSuccessMessage(translate("Successfully added %s subscriptions.").replace('%s', selected.length));
                     $scope.isAdding = false;
                     $scope.nutupane.refresh();
                 });
             }, function (response) {
-                $scope.errorMessages.push(response.data.displayMessage);
+                Notification.setErrorMessage(response.data.displayMessage);
                 $scope.isAdding = false;
                 $scope.nutupane.refresh();
             });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-base-subscriptions.controller.js

@@ -7,23 +7,24 @@
  * @requires CurrentOrganization
  * @requires Subscription
  * @requires Nutupane
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostBaseSubscriptionsController',
-    ['$scope', '$location', 'translate', 'CurrentOrganization', 'Subscription', 'HostSubscription',
-    function ($scope, $location, translate, CurrentOrganization, Subscription, HostSubscription) {
+    ['$scope', '$location', 'translate', 'CurrentOrganization', 'Subscription', 'HostSubscription', 'Notification',
+    function ($scope, $location, translate, CurrentOrganization, Subscription, HostSubscription, Notification) {
 
         function success() {
             $scope.subscription.workingMode = false;
-            $scope.$parent.successMessages = [translate('Successfully updated subscriptions.')];
+            Notification.setSuccessMessage(translate('Successfully updated subscriptions.'));
             $scope.host.$get();
         }
 
         function failure() {
             $scope.subscription.workingMode = false;
-            $scope.$parent.errorMessages = [translate('An error occurred trying to auto-attach subscriptions.  Please check your log for further information.')];
+            Notification.setErrorMessage(translate('An error occurred trying to auto-attach subscriptions.  Please check your log for further information.'));
         }
 
         $scope.subscription = {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details-info.controller.js

@@ -41,9 +41,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
             }
         });
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.showVersionAlert = false;
         $scope.editContentView = false;
         $scope.disableEnvironmentSelection = false;

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

@@ -15,11 +15,10 @@
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'GlobalNotification', 'MenuExpander', 'ApiErrorHandler',
-    function ($scope, $state, $q, translate, Host, HostSubscription, Organization, CurrentOrganization, GlobalNotification, MenuExpander, ApiErrorHandler) {
+    ['$scope', '$state', '$q', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler',
+    function ($scope, $state, $q, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler) {
         $scope.menuExpander = MenuExpander;
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
+
         $scope.panel = {
             error: false,
             loading: true
@@ -85,11 +84,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
             Host.update({id: host.id, host: whitelistedHostObject}, function (response) {
                 deferred.resolve(response);
                 $scope.host = response;
-                $scope.successMessages.push(translate('Save Successful.'));
+                Notification.setSuccessMessage(translate('Save Successful.'));
             }, function (response) {
                 deferred.reject(response);
                 _.each(response.data.error.full_messages, function (errorMessage) {
-                    $scope.errorMessages.push(translate("An error occurred saving the Content Host: ") + errorMessage);
+                    Notification.setErrorMessage(translate("An error occurred saving the Content Host: ") + errorMessage);
                 });
             });
             // @TODO end hack
@@ -126,20 +125,20 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
         $scope.unregisterContentHost = function (host) {
             var errorHandler = function (response) {
                 host.deleting = false;
-                GlobalNotification.setErrorMessage(translate('An error occured: %s').replace('%s', response.data.displayMessage));
+                Notification.setErrorMessage(translate('An error occured: %s').replace('%s', response.data.displayMessage));
             };
             host.deleting = true;
 
             if (host.unregisterDelete) {
                 host.$delete(function () {
                     host.deleting = false;
-                    GlobalNotification.setSuccessMessage(translate('Host %s has been deleted.').replace('%s', host.name));
+                    Notification.setSuccessMessage(translate('Host %s has been deleted.').replace('%s', host.name));
                     $scope.transitionTo('content-hosts');
                 }, errorHandler);
             } else {
                 HostSubscription.delete({id: host.id}, function () {
                     host.deleting = false;
-                    GlobalNotification.setSuccessMessage(translate('Host %s has been unregistered.').replace('%s', host.name));
+                    Notification.setSuccessMessage(translate('Host %s has been unregistered.').replace('%s', host.name));
                     $scope.transitionTo('content-hosts');
                 }, errorHandler);
             }

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

@@ -10,13 +10,14 @@
  * @requires Host
  * @requires CurrentOrganization
  * @requires Nutupane
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the list host collections details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsController',
-    ['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'CurrentOrganization', 'Nutupane',
-    function ($scope, $q, $location, translate, HostCollection, Host, CurrentOrganization, Nutupane) {
+    ['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'CurrentOrganization', 'Nutupane', 'Notification',
+    function ($scope, $q, $location, translate, HostCollection, Host, CurrentOrganization, Nutupane, Notification) {
         var nutupane, params;
 
         params = {
@@ -34,9 +35,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
 
         $scope.table = nutupane.table;
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.removeHostCollections = function (host) {
             var deferred = $q.defer(),
                 success,
@@ -46,8 +44,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
                 hostCollectionsToRemove;
 
             success = function (response) {
-                $scope.successMessages = [translate('Removed %x host collections from content host "%y".')
-                    .replace('%x', $scope.table.numSelected).replace('%y', host.name)];
+                var message = translate('Removed %x host collections from content host "%y".')
+                    .replace('%x', $scope.table.numSelected).replace('%y', host.name);
+
+                Notification.setSuccessMessage(message);
                 $scope.table.working = false;
                 $scope.table.selectAll(false);
                 nutupane.refresh();
@@ -57,7 +57,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
 
             error = function (response) {
                 deferred.reject(response.data.errors);
-                $scope.errorMessages = response.data.errors;
+                angular.forEach(response.data.errors, function (responseError) {
+                    Notification.setErrorMessage(responseError);
+                });
                 $scope.table.working = false;
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js

@@ -7,13 +7,14 @@
  * @requires translate
  * @requires Subscription
  * @requires SubscriptionsHelper
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper',
-    function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper', 'Notification',
+    function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper, Notification) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -51,12 +52,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
                     $scope.$parent.host = host;
                     $scope.nutupane.table.selectAll(false);
                     $scope.nutupane.refresh();
-                    $scope.successMessages.push(translate("Successfully removed %s subscriptions.").replace('%s', selected.length));
+                    Notification.setSuccessMessage(translate("Successfully removed %s subscriptions.").replace('%s', selected.length));
                     $scope.isRemoving = false;
                 });
             }, function (response) {
                 $scope.isRemoving = false;
-                $scope.errorMessages.push(translate("An error occurred removing the subscriptions.") + response.data.displayMessage);
+                Notification.setErrorMessage(translate("An error occurred removing the subscriptions.") + response.data.displayMessage);
             });
         };
     }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-repository-sets.html

@@ -9,8 +9,6 @@
     {{ "Changing default settings requires subscription-manager version 1.10 or newer to be installed on this host." | translate }}
   </div>
 
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
   <div class="loading-mask loading-mask-panel" ng-show="displayArea.working">
     <i class="fa fa-spinner fa-spin"></i>
     <span translate>Loading..."</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -1,3 +1,5 @@
+<span page-title>{{ 'Content Hosts' | translate }}</span>
+
 <div data-extend-template="layouts/table-with-header.html">
 
   <div data-block="header">
@@ -33,6 +35,10 @@
           <a ng-click="openEnvironmentModal()" disable-link="table.numSelected === 0" translate>Change Lifecycle Environment</a>
         </li>
 
+        <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openSetReleaseVersionModal()" disable-link="table.numSelected === 0" translate>Set Release Version</a>
+        </li>
+
         <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
           <a ng-click="openSubscriptionsModal()" disable-link="table.numSelected === 0" translate>Manage Subscriptions</a>
         </li>

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

@@ -13,7 +13,7 @@ angular.module('Bastion.content-views').factory('ContentView',
     ['BastionResource', 'translate', 'CurrentOrganization',
     function (BastionResource, translate, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/content_views/:id/:action',
+        return BastionResource('katello/api/v2/content_views/:id/:action',
             {id: '@id', 'organization_id': CurrentOrganization},
             {
                 copy: {method: 'POST', params: {action: 'copy'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-deletion.controller.js

@@ -4,13 +4,13 @@
  *
  * @requires $scope
  * @requires ContentView
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for deleting Content Views
  */
 angular.module('Bastion.content-views').controller('ContentViewDeletionController',
-    ['$scope', 'ContentView', 'GlobalNotification', function ($scope, ContentView, GlobalNotification) {
+    ['$scope', 'ContentView', 'Notification', function ($scope, ContentView, Notification) {
 
         function success() {
             $scope.transitionTo('content-views');
@@ -18,7 +18,7 @@ angular.module('Bastion.content-views').controller('ContentViewDeletionControlle
         }
 
         function failure(response) {
-            GlobalNotification.setErrorMessage(response.data.displayMessage);
+            Notification.setErrorMessage(response.data.displayMessage);
             $scope.working = false;
         }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-confirm.controller.js

@@ -5,15 +5,15 @@
  * @requires $scope
  * @requires ContentView
  * @requires translate
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Provides the confirmation and submit code for the content view version deletion
  *   workflow
  */
 angular.module('Bastion.content-views').controller('ContentViewVersionDeletionConfirmController',
-    ['$scope', 'ContentView', 'translate', 'GlobalNotification',
-    function ($scope, ContentView, translate, GlobalNotification) {
+    ['$scope', 'ContentView', 'translate', 'Notification',
+    function ($scope, ContentView, translate, Notification) {
 
         function success() {
             var message = translate('Successfully initiated removal of %cv version %ver.');
@@ -23,14 +23,14 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
             }
 
             message = message.replace('%cv', $scope.contentView.name).replace('%ver', $scope.version.version);
-            GlobalNotification.setSuccessMessage(message);
+            Notification.setSuccessMessage(message);
             $scope.transitionTo('content-view.versions', {contentViewId: $scope.contentView.id});
         }
 
         function error(response) {
             $scope.deleting = false;
             angular.forEach(response.data.errors, function (responseError) {
-                GlobalNotification.setErrorMessage(responseError);
+                Notification.setErrorMessage(responseError);
             });
         }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-component.factory.js

@@ -12,19 +12,19 @@ angular.module('Bastion.content-views').factory('ContentViewComponent',
     ['BastionResource', 'CurrentOrganization',
     function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('/katello/api/v2/content_views/:compositeContentViewId/content_view_components/:id/:action',
+        return BastionResource('katello/api/v2/content_views/:compositeContentViewId/content_view_components/:id/:action',
             {id: '@id', compositeContentViewId: '@compositeContentViewId', 'organization_id': CurrentOrganization},
             {
                 update: {method: 'PUT'},
                 removeComponents: {
                     method: 'PUT',
                     isArray: false,
-                    url: '/katello/api/v2/content_views/:compositeContentViewId/content_view_components/remove'
+                    url: 'katello/api/v2/content_views/:compositeContentViewId/content_view_components/remove'
                 },
                 addComponents: {
                     method: 'PUT',
                     isArray: false,
-                    url: '/katello/api/v2/content_views/:compositeContentViewId/content_view_components/add'
+                    url: 'katello/api/v2/content_views/:compositeContentViewId/content_view_components/add'
                 }
             }
         );

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

@@ -7,21 +7,21 @@
  * @requires ContentView
  * @requires translate
  * @requires ApiErrorHandler
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Provides the functionality specific to the Content View Details page.
  */
 angular.module('Bastion.content-views').controller('ContentViewDetailsController',
-    ['$scope', '$q', 'ContentView', 'translate', 'ApiErrorHandler', 'GlobalNotification',
-    function ($scope, $q, ContentView, translate, ApiErrorHandler, GlobalNotification) {
+    ['$scope', '$q', 'ContentView', 'translate', 'ApiErrorHandler', 'Notification',
+    function ($scope, $q, ContentView, translate, ApiErrorHandler, Notification) {
         $scope.saveSuccess = function () {
-            GlobalNotification.setSuccessMessage(translate('Content View updated.'));
+            Notification.setSuccessMessage(translate('Content View updated.'));
         };
 
         $scope.saveError = 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);
             });
         };
 
@@ -49,7 +49,7 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
             ContentView.copy({id: $scope.contentView.id, 'content_view': {name: newName}}, function (response) {
                 $scope.transitionTo('content-view.info', {contentViewId: response.id});
             }, function (response) {
-                GlobalNotification.setErrorMessage(response.data.displayMessage);
+                Notification.setErrorMessage(response.data.displayMessage);
             });
         };
 

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

@@ -8,7 +8,7 @@
  * @requires ContentViewVersion
  * @requires Organization
  * @requires CurrentOrganization
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Provides the functionality specific to ContentViews for use with the Nutupane UI pattern.
@@ -16,21 +16,21 @@
  *   within the table.
  */
 angular.module('Bastion.content-views').controller('ContentViewPromotionController',
-    ['$scope', '$q', 'translate', 'ContentViewVersion', 'Organization', 'CurrentOrganization', 'GlobalNotification',
-    function ($scope, $q, translate, ContentViewVersion, Organization, CurrentOrganization, GlobalNotification) {
+    ['$scope', '$q', 'translate', 'ContentViewVersion', 'Organization', 'CurrentOrganization', 'Notification',
+    function ($scope, $q, translate, ContentViewVersion, Organization, CurrentOrganization, Notification) {
 
         function success() {
             var message = translate('Successfully initiated promotion of %cv version %ver to %env.');
             message = message.replace('%cv', $scope.contentView.name).replace('%env', $scope.selectedEnvironment.name);
             message = message.replace('%ver', $scope.version.version);
             $scope.promoting = false;
-            GlobalNotification.setSuccessMessage(message);
+            Notification.setSuccessMessage(message);
             $scope.transitionTo('content-view.versions', {contentViewId: $scope.contentView.id});
         }
 
         function failure(response) {
             $scope.promoting = false;
-            GlobalNotification.setErrorMessage(response.data.displayMessage);
+            Notification.setErrorMessage(response.data.displayMessage);
         }
 
         $scope.promotion = {};

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

@@ -5,7 +5,7 @@
  * @requires $scope
  * @requires translate
  * @requires ContentView
- * @requires GlobalNotification
+ * @requires Notification
  *
  * @description
  *   Provides the functionality specific to ContentViews for use with the Nutupane UI pattern.
@@ -13,7 +13,7 @@
  *   within the table.
  */
 angular.module('Bastion.content-views').controller('ContentViewPublishController',
-    ['$scope', 'translate', 'ContentView', 'GlobalNotification', function ($scope, translate, ContentView, GlobalNotification) {
+    ['$scope', 'translate', 'ContentView', 'Notification', function ($scope, translate, ContentView, Notification) {
 
         function success() {
             $scope.transitionTo('content-view.versions',
@@ -26,7 +26,7 @@ angular.module('Bastion.content-views').controller('ContentViewPublishController
         }
 
         function failure(response) {
-            GlobalNotification.setErrorMessage(response.data.displayMessage);
+            Notification.setErrorMessage(response.data.displayMessage);
             $scope.working = false;
         }