katello 3.3.0.rc1.1 → 3.3.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-package-group-filter.controller.js

@@ -7,14 +7,15 @@
  * @requires Filter
  * @requires Rule
  * @requires Nutupane
+ * @requires GlobalNotification
  *
  * @description
  *   Handles fetching package groups that are available to add to a filter and saving
  *   each selected package group as a filter rule.
  */
 angular.module('Bastion.content-views').controller('AvailablePackageGroupFilterController',
-    ['$scope', 'translate', 'PackageGroup', 'Rule', 'Nutupane',
-    function ($scope, translate, PackageGroup, Rule, Nutupane) {
+    ['$scope', 'translate', 'PackageGroup', 'Rule', 'Nutupane', 'GlobalNotification',
+    function ($scope, translate, PackageGroup, Rule, Nutupane, GlobalNotification) {
         var nutupane;
 
         nutupane = new Nutupane(
@@ -32,11 +33,13 @@ angular.module('Bastion.content-views').controller('AvailablePackageGroupFilterC
         function success(rule) {
             nutupane.removeRow(rule.uuid, 'uuid');
             $scope.filter.rules.push(rule);
-            $scope.successMessages = [translate('Package Group successfully added.')];
+            GlobalNotification.setSuccessMessage(translate('Package Group successfully added.'));
         }
 
         function failure(response) {
-            $scope.errorMessages = [response.data.displayMessage];
+            angular.forEach(response.data.displayMessage, function (error) {
+                GlobalNotification.setErrorMessage(error);
+            });
         }
 
         function saveRule(rule, filter) {
@@ -45,7 +48,7 @@ angular.module('Bastion.content-views').controller('AvailablePackageGroupFilterC
             rule.$save(params, success, failure);
         }
 
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
         nutupane.masterOnly = true;
         nutupane.table.closeItem = function () {};
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/date-type-errata-filter.controller.js

@@ -5,21 +5,24 @@
  * @requires $scope
  * @requires translate
  * @requires Rule
+ * @requires GlobalNotification
  *
  * @description
  *   Handles creating an errata filter that allows specification of a start date, end date and/or
  *   set of errata types by which to dynamically filter.
  */
 angular.module('Bastion.content-views').controller('DateTypeErrataFilterController',
-    ['$scope', 'translate', 'Rule', function ($scope, translate, Rule) {
+    ['$scope', 'translate', 'Rule', 'GlobalNotification', function ($scope, translate, Rule, GlobalNotification) {
 
         function success() {
-            $scope.successMessages = [translate('Updated errata filter - ' + $scope.filter.name)];
+            GlobalNotification.setSuccessMessage(translate('Updated errata filter - ' + $scope.filter.name));
         }
 
         function failure(response) {
             $scope.rule.working = false;
-            $scope.errorMessages = [response.data.displayMessage];
+            angular.forEach(response.data.displayMessage, function (error) {
+                GlobalNotification.setErrorMessage(error);
+            });
         }
 
         $scope.filter.$promise.then(function (filter) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/edit-filter.controller.js

@@ -5,29 +5,27 @@
  * @requires $scope
  * @requires $q
  * @requires translate
+ * @requires GlobalNotification
  *
  * @description
  *   Provides functionality for editing name and description of content view filters.
  */
 angular.module('Bastion.content-views').controller('FilterEditController',
-    ['$scope', '$q', 'translate', function ($scope, $q, translate) {
-    $scope.successMessages = [];
-    $scope.errorMessages = [];
-
+    ['$scope', '$q', 'translate', 'GlobalNotification', function ($scope, $q, translate, GlobalNotification) {
     $scope.save = function (filter) {
         var deferred = $q.defer();
         var success;
         var failure = function (response) {
             deferred.reject(response);
             angular.forEach(response.data.errors, function (errorMessage) {
-                $scope.errorMessages.push(translate("An error occurred saving the Filter: ") + errorMessage);
+                GlobalNotification.setErrorMessage(translate("An error occurred saving the Filter: ") + errorMessage);
             });
             $scope.working = false;
         };
 
         success = function (response) {
             deferred.resolve(response);
-            $scope.successMessages.push(translate('Filter Saved'));
+            GlobalNotification.setSuccessMessage(translate('Filter Saved'));
             $scope.working = false;
             $scope.$emit('filter.updated');
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/errata-filter-list.controller.js

@@ -7,14 +7,15 @@
  * @requires Nutupane
  * @requires Filter
  * @requires Rule
+ * @requires GlobalNotification
  *
  * @description
  *   Handles displaying a list of errata currently added to the filter and the ability
  *   to remove errata from the filter.
  */
 angular.module('Bastion.content-views').controller('ErrataFilterListController',
-    ['$scope', 'translate', 'Nutupane', 'Erratum', 'Rule',
-    function ($scope, translate, Nutupane, Erratum, Rule) {
+    ['$scope', 'translate', 'Nutupane', 'Erratum', 'Rule', 'GlobalNotification',
+    function ($scope, translate, Nutupane, Erratum, Rule, GlobalNotification) {
         var nutupane;
 
         function findRules(errataIds) {
@@ -40,11 +41,11 @@ angular.module('Bastion.content-views').controller('ErrataFilterListController',
             $scope.filter.rules = _.reject($scope.filter.rules, function (filterRule) {
                 return rule.id === filterRule.id;
             });
-            $scope.$parent.successMessages = [translate('Errata successfully removed.')];
+            GlobalNotification.setSuccessMessage(translate('Errata successfully removed.'));
         }
 
         function failure(response) {
-            $scope.$parent.errorMessages = [response.data.displayMessage];
+            GlobalNotification.setErrorMessage(response.data.displayMessage);
         }
 
         $scope.nutupane = nutupane = new Nutupane(Erratum, {
@@ -55,7 +56,7 @@ angular.module('Bastion.content-views').controller('ErrataFilterListController',
             'queryUnpaged'
         );
 
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.removeErrata = function () {
             var errataIds = nutupane.getAllSelectedResults('errata_id').included.ids,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/errata-filter.controller.js

@@ -9,10 +9,6 @@
  */
 angular.module('Bastion.content-views').controller('ErrataFilterController',
     ['$scope', function ($scope) {
-
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.rule = {
             errataType: 'all',
             'start_date': null,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-repositories.controller.js

@@ -6,13 +6,14 @@
  * @requires translate
  * @requires Filter
  * @requires ContentViewRepositoriesUtl
+ * @requires GlobalNotification
  *
  * @description
  *   Provides a way for users to select which repositories the filter applies to.
  */
 angular.module('Bastion.content-views').controller('FilterRepositoriesController',
-    ['$scope', 'translate', 'Filter', 'ContentViewRepositoriesUtil',
-    function ($scope, translate, Filter, ContentViewRepositoriesUtil) {
+    ['$scope', 'translate', 'Filter', 'ContentViewRepositoriesUtil', 'GlobalNotification',
+    function ($scope, translate, Filter, ContentViewRepositoriesUtil, GlobalNotification) {
         var refreshTable, success, error;
 
         ContentViewRepositoriesUtil($scope);
@@ -35,31 +36,31 @@ angular.module('Bastion.content-views').controller('FilterRepositoriesController
                 });
             }
 
-            $scope.repositoriesTable.rows = displayedRepositories;
+            $scope.table.rows = displayedRepositories;
             $scope.showRepos = filterRepositories.length !== 0;
         };
 
         success = function (filter) {
             refreshTable(filter);
-            $scope.successMessages = [translate('Affected repositories have been updated.')];
+            GlobalNotification.setSuccessMessage(translate('Affected repositories have been updated.'));
         };
 
         error = function (response) {
-            $scope.errorMessages = response.data.errors;
+            angular.forEach(response.errors, function (responseError) {
+                GlobalNotification.setErrorMessage(responseError);
+            });
         };
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
         $scope.showRepos = false;
-        $scope.repositoriesTable = {};
+        $scope.table = {};
 
         $scope.filter.$promise.then(refreshTable);
 
         $scope.updateRepositories = function () {
-            var repositoryIds = _.map($scope.repositoriesTable.getSelected(), 'id');
+            var repositoryIds = _.map($scope.table.getSelected(), 'id');
 
             if (repositoryIds.length === 0) {
-                $scope.errorMessages = [translate('You must select at least one repository.')];
+                GlobalNotification.setErrorMessage(translate('You must select at least one repository.'));
             } else {
                 Filter.update({id: $scope.filter.id, 'repository_ids': repositoryIds}, success, error);
             }

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

@@ -6,12 +6,13 @@
  * @requires translate
  * @requires Filter
  * @requires Nutupane
+ * @requires GlobalNotification
  *
  * @description
  *   Handles loading all filters for a content view.
  */
 angular.module('Bastion.content-views').controller('FiltersController',
-    ['$scope', 'translate', 'Filter', 'Nutupane', function ($scope, translate, Filter, Nutupane) {
+    ['$scope', 'translate', 'Filter', 'Nutupane', 'GlobalNotification', function ($scope, translate, Filter, Nutupane, GlobalNotification) {
         var nutupane;
 
         function removeFilter(id) {
@@ -19,21 +20,22 @@ angular.module('Bastion.content-views').controller('FiltersController',
 
             success = function () {
                 nutupane.removeRow(id);
-                $scope.successMessages = [translate('Filters successfully removed.')];
+                GlobalNotification.setSuccessMessage(translate('Filters successfully removed.'));
             };
 
             failure = function (response) {
-                $scope.errorMessages = [response.data.displayMessage];
+                GlobalNotification.setErrorMessage(response.data.displayMessage);
             };
 
             Filter.delete({filterId: id}, success, failure);
         }
 
         nutupane = new Nutupane(Filter, {
-            'content_view_id': $scope.$stateParams.contentViewId
+            'content_view_id': $scope.$stateParams.contentViewId,
+            'types[]': ["rpm", "package_group", "erratum"]
         });
 
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.$on('filter.created', function () {
             nutupane.refresh();
@@ -56,16 +58,16 @@ angular.module('Bastion.content-views').controller('FiltersController',
 
             switch (filter.type) {
             case "erratum":
-                state = "content-views.details.filters.details.erratum.list({filterId: filter.id})";
+                state = "content-view.filter.erratum.list({filterId: filter.id})";
                 if (filter.rules[0].types) {
-                    state = "content-views.details.filters.details.erratum.dateType({filterId: filter.id})";
+                    state = "content-view.filter.erratum.dateType({filterId: filter.id})";
                 }
                 break;
             case "rpm":
-                state = "content-views.details.filters.details.rpm({filterId: filter.id})";
+                state = "content-view.filter.rpm({filterId: filter.id})";
                 break;
             case "package_group":
-                state = "content-views.details.filters.details.package_group.list({filterId: filter.id})";
+                state = "content-view.filter.package_group.list({filterId: filter.id})";
                 break;
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js

@@ -5,24 +5,25 @@
  * @requires $scope
  * @requires Filter
  * @requires Rule
+ * @requires GlobalNotification
  *
  * @description
  */
 angular.module('Bastion.content-views').controller('NewFilterController',
-    ['$scope', 'Filter', 'Rule', function ($scope, Filter, Rule) {
+    ['$scope', 'Filter', 'Rule', 'GlobalNotification', function ($scope, Filter, Rule, GlobalNotification) {
         var filterType;
 
         function transitionToDetails(filter) {
             var state = '';
 
             if (filterType === 'erratumId') {
-                state = 'content-views.details.filters.details.erratum.available';
+                state = 'content-view.filter.erratum.available';
             } else if (filterType === 'erratumDateType') {
-                state = 'content-views.details.filters.details.erratum.dateType';
+                state = 'content-view.filter.erratum.dateType';
             } else if (filterType === 'rpm') {
-                state = 'content-views.details.filters.details.rpm.details';
+                state = 'content-view.filter.rpm.details';
             } else if (filterType === 'package_group') {
-                state = 'content-views.details.filters.details.package_group.available';
+                state = 'content-view.filter.package_group.available';
             }
 
             $scope.$emit('filter.created');
@@ -40,7 +41,7 @@ angular.module('Bastion.content-views').controller('NewFilterController',
             };
 
             error = function (response) {
-                $scope.errorMessages = [response.data.displayMessage];
+                GlobalNotification.setErrorMessage(response.data.displayMessage);
             };
 
             rule.$save({filterId: filter.id}, addSuccess, error);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-filter.controller.js

@@ -5,11 +5,13 @@
  * @requires $scope
  * @requires translate
  * @requires Rule
+ * @requires Package
+ * @requires GlobalNotification
  *
  * @description
  */
 angular.module('Bastion.content-views').controller('PackageFilterController',
-    ['$scope', 'translate', 'Rule', 'Package', function ($scope, translate, Rule, Package) {
+    ['$scope', 'translate', 'Rule', 'Package', 'GlobalNotification', function ($scope, translate, Rule, Package, GlobalNotification) {
 
         function type(rule) {
             var typeId;
@@ -30,7 +32,7 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
         }
 
         function failure(response) {
-            $scope.errorMessages = [response.data.displayMessage];
+            GlobalNotification.setErrorMessage(response.data.displayMessage);
         }
 
         function addType(rules) {
@@ -50,7 +52,7 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
                         $scope.filter.rules.splice(index, 1);
                     }
                 });
-                $scope.successMessages = [translate('Package successfully removed.')];
+                GlobalNotification.setSuccessMessage(translate('Package successfully removed.'));
             };
 
             Rule.delete({filterId: rule['content_view_filter_id'], ruleId: ruleId}, success, failure);
@@ -65,12 +67,9 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
             addType([rule]);
             $scope.filter.rules.push(rule);
 
-            $scope.successMessages = [translate('Package successfully added.')];
+            GlobalNotification.setSuccessMessage(translate('Package successfully added.'));
         }
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
         $scope.rule = {
             type: 'all',
             editMode: false,
@@ -79,6 +78,7 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
 
         $scope.filter.$promise.then(function (filter) {
             addType(filter.rules);
+            $scope.table = {rows: filter.rules};
         });
 
         $scope.addRule = function (rule, filter) {
@@ -96,7 +96,7 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
                 rule.previous = {};
                 rule.editMode = false;
                 rule.working = false;
-                $scope.successMessages = [translate('Package successfully updated.')];
+                GlobalNotification.setSuccessMessage(translate('Package successfully updated.'));
             };
 
             error = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-group-list-filter.controller.js

@@ -7,14 +7,15 @@
  * @requires Filter
  * @requires Rule
  * @requires Nutupane
+ * @requires GlobalNotification
  *
  * @description
  *   Handles loading package groups that have been added to the filter via filter rules
  *   and provides a method to remove them.
  */
 angular.module('Bastion.content-views').controller('PackageGroupFilterListController',
-    ['$scope', 'translate', 'PackageGroup', 'Rule', 'Nutupane',
-    function ($scope, translate, PackageGroup, Rule, Nutupane) {
+    ['$scope', 'translate', 'PackageGroup', 'Rule', 'Nutupane', 'GlobalNotification',
+    function ($scope, translate, PackageGroup, Rule, Nutupane, GlobalNotification) {
         var nutupane;
 
         function success(rule) {
@@ -22,11 +23,11 @@ angular.module('Bastion.content-views').controller('PackageGroupFilterListContro
             $scope.filter.rules = _.reject($scope.filter.rules, function (filterRule) {
                 return rule.id === filterRule.id;
             });
-            $scope.successMessages = [translate('Package Group successfully removed.')];
+            GlobalNotification.setSuccessMessage(translate('Package Group successfully removed.'));
         }
 
         function failure(response) {
-            $scope.errorMessages = [response.data.displayMessage];
+            GlobalNotification.setErrorMessage(response.data.displayMessage);
         }
 
         function findRules(packageGroupIds) {
@@ -55,7 +56,7 @@ angular.module('Bastion.content-views').controller('PackageGroupFilterListContro
             'queryUnpaged'
         );
 
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
         nutupane.table.closeItem = function () {};
 
         $scope.removePackageGroups = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/date-type-errata-filter.html

@@ -1,11 +1,9 @@
 <form name="errataForm" class="col-sm-5">
-  <div data-block="messages" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
   <div ng-include="'content-views/details/filters/views/date-type-errata.html'"></div>
 
   <div bst-form-buttons
-       on-cancel="transitionTo('content-views.details.filters.list', {contentViewId: contentView.id})"
+       on-cancel="transitionTo('content-view.filters', {contentViewId: contentView.id})"
        on-save="save(rule, filter)"
        working="rule.working">
   </div>
-
 </form>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/edit-filter.html

@@ -1,5 +1,4 @@
 <span page-title ng-model="filter">{{ 'Filter information for:' | translate }} {{ filter.name }}</span>
-<div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
 <div class="detail">
   <span class="info-label" translate>Name</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/errata-filter-details.html

@@ -1,33 +1,29 @@
-<div ng-if="isState('content-views.details.filters.details.erratum.available')">
-  <div class="row">
-    <form name="errataForm" class="col-sm-5">
-      <div ng-include="'content-views/details/filters/views/date-type-errata.html'"></div>
-    </form>
-  </div>
+<div ng-if="isState('content-view.filter.erratum.available')">
+  <form name="errataForm" class="col-sm-5">
+    <div ng-include="'content-views/details/filters/views/date-type-errata.html'"></div>
+  </form>
 </div>
 
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <span data-block="no-rows-message" translate>No Errata to display</span>
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+    No Errata to display
+  </span>
 
   <span data-block="no-search-results-message" translate>
     Your search returned zero Errata.
   </span>
 
-  <div data-block="actions">
-    <button class="btn btn-primary fr"
-            ng-show="isState('content-views.details.filters.details.erratum.list') && permitted('edit_content_views', contentView)"
-            ng-disabled="detailsTable.working || detailsTable.numSelected === 0"
+  <div data-block="list-actions">
+    <button class="btn btn-primary"
+            ng-show="isState('content-view.filter.erratum.list') && permitted('edit_content_views', contentView)"
+            ng-disabled="table.working || table.numSelected === 0"
             ng-click="removeErrata(contentView)">
-      <i class="fa fa-trash-o"></i>
       <span translate>Remove Errata</span>
     </button>
-    <button class="btn btn-primary fr"
-            ng-show="isState('content-views.details.filters.details.erratum.available') && permitted('edit_content_views', contentView)"
-            ng-disabled="detailsTable.working || detailsTable.numSelected === 0"
+    <button class="btn btn-primary"
+            ng-show="isState('content-view.filter.erratum.available') && permitted('edit_content_views', contentView)"
+            ng-disabled="table.working || table.numSelected === 0"
             ng-click="addErrata(filter)">
-      <i class="fa fa-plus"></i>
       <span translate>Add Errata</span>
     </button>
   </div>
@@ -44,7 +40,7 @@
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="errata in detailsTable.rows" row-select="errata">
+      <tr bst-table-row ng-repeat="errata in table.rows" row-select="errata">
         <td bst-table-cell>{{ errata.errata_id }}</td>
         <td bst-table-cell>
           {{ errata.type }}
@@ -59,5 +55,4 @@
       </tr>
     </tbody>
   </table>
-
 </div>