katello 3.5.0.rc1 → 3.5.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-environment-modal.controller.js

@@ -9,15 +9,15 @@
  * @requires Organization
  * @requires CurrentOrganization
  * @requires ContentView
- * @requires GlobalNotification
+ * @requires Notification
  * @requires hostIds
  *
  * @description
  *   A controller for providing bulk action functionality for setting content view and environment
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkEnvironmentModalController',
-    ['$scope', '$state', '$uibModalInstance', 'HostBulkAction', 'Organization', 'CurrentOrganization', 'ContentView', 'GlobalNotification', 'hostIds',
-    function ($scope, $state, $uibModalInstance, HostBulkAction, Organization, CurrentOrganization, ContentView, GlobalNotification, hostIds) {
+    ['$scope', '$state', '$uibModalInstance', 'HostBulkAction', 'Organization', 'CurrentOrganization', 'ContentView', 'Notification', 'hostIds',
+    function ($scope, $state, $uibModalInstance, HostBulkAction, Organization, CurrentOrganization, ContentView, Notification, hostIds) {
 
         function actionParams() {
             var params = hostIds;
@@ -60,7 +60,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkEnvironmentM
                 $state.go('content-hosts.bulk-task', {taskId: task.id});
             }, function (response) {
                 angular.forEach(response.data.errors, function (error) {
-                    GlobalNotification.setErrorMessage(error);
+                    Notification.setErrorMessage(error);
                 });
             });
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js

@@ -12,7 +12,7 @@
  * @requires Nutupane
  * @requires CurrentOrganization
  * @requires Erratum
- * @requires GlobalNotification
+ * @requires Notification
  * @requires BastionConfig
  * @requires hostIds
  *
@@ -20,8 +20,8 @@
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalController',
-    ['$scope', '$http', '$location', '$window', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'GlobalNotification', 'BastionConfig', 'hostIds',
-    function ($scope, $http, $location, $window, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, GlobalNotification, BastionConfig, hostIds) {
+    ['$scope', '$http', '$location', '$window', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'Notification', 'BastionConfig', 'hostIds',
+    function ($scope, $http, $location, $window, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds) {
         var nutupane;
 
         function installParams() {
@@ -89,7 +89,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
                 },
                 function (response) {
                     angular.forEach(response.data.errors, function (error) {
-                        GlobalNotification.setErrorMessage(error);
+                        Notification.setErrorMessage(error);
                     });
                 });
         };
@@ -106,7 +106,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
             formData.search = selectedHosts.included.search;
             formData.customize = customize;
 
-            $http.post('/katello/remote_execution', formData, {
+            $http.post('katello/remote_execution', formData, {
                 headers: {'Content-Type': 'application/x-www-form-urlencoded'
             }});
         };

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

@@ -10,15 +10,15 @@
  * @requires HostBulkAction
  * @requires HostCollection
  * @requires CurrentOrganization
- * @requires GlobalNotification
+ * @requires Notification
  * @requires hostIds
  *
  * @description
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkHostCollectionsModalController',
-    ['$scope', '$location', '$uibModalInstance', 'translate', 'Nutupane', 'HostBulkAction', 'HostCollection', 'CurrentOrganization', 'GlobalNotification', 'hostIds',
-    function ($scope, $location, $uibModalInstance, translate, Nutupane, HostBulkAction, HostCollection, CurrentOrganization, GlobalNotification, hostIds) {
+    ['$scope', '$location', '$uibModalInstance', 'translate', 'Nutupane', 'HostBulkAction', 'HostCollection', 'CurrentOrganization', 'Notification', 'hostIds',
+    function ($scope, $location, $uibModalInstance, translate, Nutupane, HostBulkAction, HostCollection, CurrentOrganization, Notification, hostIds) {
         var nutupane, nutupaneParams;
 
         $scope.hostCollections = {
@@ -56,14 +56,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkHostCollecti
 
             success = function (data) {
                 angular.forEach(data.displayMessages, function (message) {
-                    GlobalNotification.setSuccessMessage(message);
+                    Notification.setSuccessMessage(message);
                 });
                 nutupane.invalidate();
             };
 
             error = function (response) {
                 angular.forEach(response.data.errors, function (responseError) {
-                    GlobalNotification.setErrorMessage(responseError);
+                    Notification.setErrorMessage(responseError);
                 });
                 $scope.editMode = true;
             };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js

@@ -10,7 +10,7 @@
  * @requires HostBulkAction
  * @requires CurrentOrganization
  * @requires translate
- * @requires GlobalNotification
+ * @requires Notification
  * @requires BastionConfig
  * @requires hostIds
  *
@@ -18,8 +18,8 @@
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModalController',
-    ['$scope', '$location', '$timeout', '$window', '$uibModalInstance', 'HostBulkAction', 'CurrentOrganization', 'translate', 'GlobalNotification', 'BastionConfig', 'hostIds',
-    function ($scope, $location, $timeout, $window, $uibModalInstance, HostBulkAction, CurrentOrganization, translate, GlobalNotification, BastionConfig, hostIds) {
+    ['$scope', '$location', '$timeout', '$window', '$uibModalInstance', 'HostBulkAction', 'CurrentOrganization', 'translate', 'Notification', 'BastionConfig', 'hostIds',
+    function ($scope, $location, $timeout, $window, $uibModalInstance, HostBulkAction, CurrentOrganization, translate, Notification, BastionConfig, hostIds) {
 
         function successMessage(type) {
             var messages = {
@@ -93,12 +93,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
             $scope.content.confirm = false;
 
             success = function () {
-                GlobalNotification.setSuccessMessage(successMessage($scope.content.action));
+                Notification.setSuccessMessage(successMessage($scope.content.action));
             };
 
             error = function (response) {
                 angular.forEach(response.data.errors, function (responseError) {
-                    GlobalNotification.setErrorMessage(responseError);
+                    Notification.setErrorMessage(responseError);
                 });
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-release-version-modal.controller.js

@@ -0,0 +1,62 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkReleaseVersionModalController
+ *
+ * @requires $scope
+ * @requires $state
+ * @requires $uibModalInstance
+ * @requires HostBulkAction
+ * @requires Organization
+ * @requires CurrentOrganization
+ * @requires Notification
+ * @requires hostIds
+ *
+ * @description
+ *   A controller for providing bulk action functionality for setting content view and environment
+ */
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkReleaseVersionModalController',
+    ['$scope', '$state', '$uibModalInstance', 'HostBulkAction', 'Organization', 'CurrentOrganization', 'Notification', 'hostIds',
+    function ($scope, $state, $uibModalInstance, HostBulkAction, Organization, CurrentOrganization, Notification, hostIds) {
+
+        function actionParams() {
+            var params = hostIds;
+            params['organization_id'] = CurrentOrganization;
+            params['release_version'] = $scope.selected.release;
+
+            return params;
+        }
+
+        $scope.selected = {
+            release: undefined
+        };
+        $scope.fetchingReleases = true;
+
+        Organization.releaseVersions({id: CurrentOrganization}, function (response) {
+            $scope.releases = response.results;
+            $scope.fetchingReleases = false;
+        });
+
+        $scope.disableAssignButton = function (confirm) {
+            return confirm || hostIds === 0 || angular.isUndefined($scope.selected.release);
+        };
+
+        $scope.performAction = function () {
+            HostBulkAction.releaseVersion(actionParams(), function (task) {
+                $scope.ok();
+                $state.go('content-hosts.bulk-task', {taskId: task.id});
+            }, function (response) {
+                angular.forEach(response.data.errors, function (error) {
+                    Notification.setErrorMessage(error);
+                });
+            });
+        };
+
+        $scope.ok = function () {
+            $uibModalInstance.close();
+        };
+
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js

@@ -10,15 +10,15 @@
  * @requires HostBulkAction
  * @requires RepositorySet
  * @requires CurrentOrganization
- * @requires GlobalNotification
+ * @requires Notification
  * @requires hostIds
  *
  * @description
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkRepositorySetsModalController',
-    ['$scope', '$location', '$uibModalInstance', 'translate', 'Nutupane', 'HostBulkAction', 'RepositorySet', 'CurrentOrganization', 'GlobalNotification', 'hostIds',
-    function ($scope, $location, $uibModalInstance, translate, Nutupane, HostBulkAction, RepositorySet, CurrentOrganization, GlobalNotification, hostIds) {
+    ['$scope', '$location', '$uibModalInstance', 'translate', 'Nutupane', 'HostBulkAction', 'RepositorySet', 'CurrentOrganization', 'Notification', 'hostIds',
+    function ($scope, $location, $uibModalInstance, translate, Nutupane, HostBulkAction, RepositorySet, CurrentOrganization, Notification, hostIds) {
         var nutupane, nutupaneParams;
 
         $scope.repositorySets = {
@@ -83,7 +83,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkRepositorySe
 
             error = function (response) {
                 angular.forEach(response.data.errors, function (responseError) {
-                    GlobalNotification.setErrorMessage(responseError);
+                    Notification.setErrorMessage(responseError);
                 });
                 $scope.editMode = true;
             };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js

@@ -10,15 +10,15 @@
  * @requires Subscription
  * @requires ContentHost
  * @requires SubscriptionsHelper
- * @requires GlobalNotification
+ * @requires Notification
  * @requires hostIds
  *
  * @description
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscriptionsModalController',
-    ['$scope', '$location', '$uibModalInstance', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper', 'GlobalNotification', 'hostIds',
-        function ($scope, $location, $uibModalInstance, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper, GlobalNotification, hostIds) {
+    ['$scope', '$location', '$uibModalInstance', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper', 'Notification', 'hostIds',
+        function ($scope, $location, $uibModalInstance, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper, Notification, hostIds) {
             var success, error, params = {
                 'organization_id': CurrentOrganization,
                 'sort_order': 'ASC',
@@ -40,7 +40,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscription
 
             error = function (response) {
                 angular.forEach(response.data.errors, function (responseError) {
-                    GlobalNotification.setErrorMessage(responseError);
+                    Notification.setErrorMessage(responseError);
                 });
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html

@@ -0,0 +1,56 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header" translate>Content Host Bulk Content</h4>
+
+  <div data-block="modal-body">
+    <h4 translate>Assign Release Version</h4>
+
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+
+    <div bst-alert="info" ng-show="showConfirm">
+      <span translate>
+        Are you sure you want to set the Release Version the {{ table.numSelected }} content host(s) selected to {{ selected.release }}?. This action will affect only those Content Hosts that belong to the appropriate Content View and Lifecycle Environment containining that release version.
+      </span>
+      <div>
+        <button type="button" class="btn btn-default" ng-click="showConfirm = false; performAction()" translate>Yes</button>
+        <button type="button" class="btn btn-default" ng-click="showConfirm = false;" translate>No</button>
+      </div>
+    </div>
+
+    <form name="contentHostContentForm" class="form" ng-hide="content.workingMode">
+      <div>
+        <label translate>Release Version:</label>
+
+        <i ng-show="fetchingReleases" class="fa fa-spinner inline-icon fa-spin"></i>
+        <select ng-hide="fetchingReleases || releases.length === 0"
+                type="select"
+                ng-options="release for release in releases"
+                ng-model="selected.release">
+        </select>
+
+        <p class="page-error" ng-show="!fetchingReleases && releases.length === 0" translate>
+          No releases exist in the Library.
+        </p>
+
+      </div>
+
+      <button class="btn btn-default"
+              type="button"
+              ng-hide="denied('edit_hosts')"
+              ng-click="showConfirm = true;"
+              ng-disabled="disableAssignButton(showConfirm)">
+        <span translate>Assign</span>
+      </button>
+
+    </form>
+  </div>
+
+  <div data-block="modal-footer">
+    <button type="button" class="btn btn-primary" ng-click="ok()" translate>
+      Done
+    </button>
+  </div>
+</div>

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

@@ -100,7 +100,7 @@
               </td>
               <td bst-table-cell>{{ subscription | subscriptionConsumedFilter }}</td>
               <td bst-table-cell><div subscription-type="subscription"></div></td>
-              <td bst-table-cell>{{ subscription.start_date | date:"shortDate" }}</td>
+              <td bst-table-cell><div subscription-start-date="subscription"></div></td>
               <td bst-table-cell>{{ subscription.end_date | date:"shortDate" }}</td>
               <td bst-table-cell>{{ subscription.support_level }}</td>
               <td bst-table-cell>{{ subscription.contract_number }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js

@@ -57,6 +57,17 @@ angular.module('Bastion.content-hosts').service('ContentHostsModalHelper', ['$ui
             });
         };
 
+        this.openReleaseVersionModal = function() {
+            $uibModal.open({
+                templateUrl: 'content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html',
+                controller: 'ContentHostsBulkReleaseVersionModalController',
+                size: 'lg',
+                resolve: {
+                    hostIds: this.resolveFunc()
+                }
+            });
+        };
+
         this.openSubscriptionsModal = function() {
             $uibModal.open({
                 templateUrl: 'content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html',

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

@@ -5,13 +5,12 @@
  * @requires $scope
  * @requires $q
  * @requires $location
- * @requires $window
  * @requires $uibModal
  * @requires translate
  * @requires Nutupane
  * @requires Host
  * @requires HostBulkAction
- * @requires GlobalNotification
+ * @requires Notification
  * @requires CurrentOrganization
  * @requires ContentHostsHelper
  *
@@ -21,13 +20,10 @@
  *   within the table.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsController',
-    ['$scope', '$q', '$state', '$location', '$window', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'GlobalNotification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer',
-    function ($scope, $q, $state, $location, $window, $uibModal, translate, Nutupane, Host, HostBulkAction, GlobalNotification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer) {
+    ['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer',
+    function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer) {
         var nutupane, params, query;
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         if ($location.search().search) {
             query = '"' + $location.search().search + '"';
         } else {
@@ -91,13 +87,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
 
             success = function (data) {
                 deferred.resolve(data);
-                $window.location = "/foreman_tasks/tasks/" + data.id;
+                $location.path("/foreman_tasks/tasks/" + data.id);
             };
 
             error = function (response) {
                 deferred.reject(response.data.errors);
                 angular.forEach(response.data.errors, function (responseError) {
-                    GlobalNotification.setErrorMessage(responseError);
+                    Notification.setErrorMessage(responseError);
                 });
             };
 
@@ -144,6 +140,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
             ContentHostsModalHelper.openEnvironmentModal();
         };
 
+        $scope.openSetReleaseVersionModal = function () {
+            nutupane.invalidate();
+            ContentHostsModalHelper.openReleaseVersionModal();
+        };
+
         $scope.openSubscriptionsModal = function () {
             nutupane.invalidate();
             ContentHostsModalHelper.openSubscriptionsModal();

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

@@ -8,13 +8,14 @@
  * @requires ContentHostPackage
  * @requires translate
  * @requires Nutupane
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the content host packages list and actions.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostPackagesController',
-    ['$scope', '$timeout', '$window', 'HostPackage', 'translate', 'Nutupane', 'BastionConfig',
-    function ($scope, $timeout, $window, HostPackage, translate, Nutupane, BastionConfig) {
+    ['$scope', '$timeout', '$window', 'HostPackage', 'translate', 'Nutupane', 'BastionConfig', 'Notification',
+    function ($scope, $timeout, $window, HostPackage, translate, Nutupane, BastionConfig, Notification) {
         var packageActions;
 
         $scope.openEventInfo = function (event) {
@@ -29,11 +30,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
         };
 
         $scope.errorHandler = function (response) {
-            $scope.errorMessages = response.data.errors;
+            angular.forEach(response.data.errors, function (responseError) {
+                Notification.setErrorMessage(responseError);
+            });
             $scope.working = false;
         };
 
-        $scope.errorMessages = [];
         $scope.working = false;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;

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

@@ -17,8 +17,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostTracesController'
     ['$scope', '$timeout', '$window', 'translate', 'HostTraces', 'Nutupane', 'BastionConfig',
     function ($scope, $timeout, $window, translate, HostTraces, Nutupane, BastionConfig) {
         var tracesNutupane, params = {
-            'sort_by': 'updated',
-            'sort_order': 'DESC',
             'paged': true
         };
 

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

@@ -35,9 +35,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
 
         $scope.table = nutupane.table;
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.addHostCollections = function (host) {
             var deferred = $q.defer(),
                 success,
@@ -47,8 +44,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
                 hostCollectionsToAdd;
 
             success = function (response) {
-                $scope.successMessages = [translate('Added %x host collections to content host "%y".')
-                    .replace('%x', $scope.table.numSelected).replace('%y', host.name)];
+                Notification.setSuccessMessage(translate('Added %x host collections to content host "%y".')
+                    .replace('%x', $scope.table.numSelected).replace('%y', host.name));
                 $scope.table.working = false;
                 $scope.table.selectAll(false);
                 nutupane.refresh();
@@ -58,7 +55,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
 
             error = function (response) {
                 deferred.reject(response.data.errors);
-                $scope.errorMessages = response.data.errors.base;
+                Notification.setErrataIds(response.data.errors.base);
                 $scope.table.working = false;
             };