katello 3.2.1.1 → 3.3.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-subscriptions.controller.js

@@ -30,23 +30,23 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAddSubscripti
         };
 
         $scope.contentNutupane = new Nutupane(Subscription, params);
-        $scope.detailsTable = $scope.contentNutupane.table;
+        $scope.table = $scope.contentNutupane.table;
         $scope.isAdding = false;
         $scope.contentNutupane.setSearchKey('subscriptionSearch');
         $scope.contentNutupane.masterOnly = true;
 
         $scope.groupedSubscriptions = {};
-        $scope.$watch('detailsTable.rows', function (rows) {
+        $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
         });
 
         $scope.disableAddButton = function () {
-            return $scope.detailsTable.numSelected === 0 || $scope.isAdding;
+            return $scope.table.numSelected === 0 || $scope.isAdding;
         };
 
         $scope.addSelected = function () {
             var selected;
-            selected = SubscriptionsHelper.getSelectedSubscriptionAmounts($scope.detailsTable);
+            selected = SubscriptionsHelper.getSelectedSubscriptionAmounts($scope.table);
 
             $scope.isAdding = true;
             ActivationKey.addSubscriptions({id: $scope.activationKey.id, 'subscriptions': selected}, function () {

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

@@ -39,11 +39,11 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
         contentHostsNutupane.masterOnly = true;
         contentHostsNutupane.setSearchKey('contentHostSearch');
 
-        $scope.detailsTable = contentHostsNutupane.table;
-        $scope.detailsTable.working = true;
+        $scope.table = contentHostsNutupane.table;
+        $scope.table.working = true;
 
         if ($scope.contentHosts) {
-            $scope.detailsTable.working = false;
+            $scope.table.working = false;
         }
 
         $scope.activationKey.$promise.then(function () {

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

@@ -0,0 +1,30 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc controller
+     * @name  Bastion.activation-keys.controller:ActivationKeyCopyController
+     *
+     * @description
+     *   For copying a host collection.
+     */
+    function ActivationKeyCopyController($scope, ActivationKey) {
+        $scope.successMessages = [];
+        $scope.errorMessages = [];
+
+        $scope.copy = function (newName) {
+            ActivationKey.copy({id: $scope.activationKey.id, 'new_name': newName}, function (response) {
+                $scope.transitionTo('activation-key.info', {activationKeyId: response.id});
+            }, function (response) {
+                $scope.copyErrorMessages.push(response.data.displayMessage);
+            });
+        };
+    }
+
+    angular
+        .module('Bastion.activation-keys')
+        .controller('ActivationKeyCopyController', ActivationKeyCopyController);
+
+    ActivationKeyCopyController.$inject = ['$scope', 'ActivationKey'];
+
+})();

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

@@ -44,7 +44,6 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsContro
             activationKey.$update(function (response) {
                 deferred.resolve(response);
                 $scope.successMessages.push(translate('Activation Key updated'));
-                $scope.table.replaceRow(response);
             }, function (response) {
                 deferred.reject(response);
                 $scope.errorMessages.push(translate("An error occurred saving the Activation Key: ") + response.data.displayMessage);
@@ -56,22 +55,9 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsContro
             $scope.activationKey = activationKey;
         };
 
-        $scope.copy = function (newName) {
-            ActivationKey.copy({id: $scope.activationKey.id, 'new_name': newName}, function (response) {
-                $scope.showCopy = false;
-                $scope.table.addRow(response);
-                $scope.transitionTo('activation-keys.details.info', {activationKeyId: response.id});
-            }, function (response) {
-                $scope.copyErrorMessages.push(response.data.displayMessage);
-            });
-        };
-
         $scope.removeActivationKey = function (activationKey) {
-            var id = activationKey.id;
-
             activationKey.$delete(function () {
-                $scope.removeRow(id);
-                $scope.transitionTo('activation-keys.index');
+                $scope.transitionTo('activation-keys');
                 GlobalNotification.setSuccessMessage(translate('Activation Key removed.'));
             }, function (response) {
                 GlobalNotification.setErrorMessage(translate("An error occurred removing the Activation Key: ") + response.data.displayMessage);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-host-collections.controller.js

@@ -29,14 +29,14 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectio
         };
 
         hostCollectionsPane = new Nutupane(ActivationKey, params, 'hostCollections');
-        $scope.hostCollectionsTable = hostCollectionsPane.table;
+        $scope.table = hostCollectionsPane.table;
 
         $scope.removeHostCollections = function () {
             var data,
                 success,
                 error,
                 deferred = $q.defer(),
-                hostCollectionsToRemove = _.pluck($scope.hostCollectionsTable.getSelected(), 'id');
+                hostCollectionsToRemove = _.map($scope.table.getSelected(), 'id');
 
             data = {
                 "activation_key": {
@@ -46,10 +46,10 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectio
 
             success = function (response) {
                 $scope.successMessages = [translate('Removed %x host collections from activation key "%y".')
-                    .replace('%x', $scope.hostCollectionsTable.numSelected)
+                    .replace('%x', $scope.table.numSelected)
                     .replace('%y', $scope.activationKey.name)];
-                $scope.hostCollectionsTable.working = false;
-                $scope.hostCollectionsTable.selectAll(false);
+                $scope.table.working = false;
+                $scope.table.selectAll(false);
                 hostCollectionsPane.refresh();
                 $scope.activationKey.$get();
                 deferred.resolve(response);
@@ -58,10 +58,10 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectio
             error = function (response) {
                 deferred.reject(response.data.errors);
                 $scope.errorMessages = response.data.errors;
-                $scope.hostCollectionsTable.working = false;
+                $scope.table.working = false;
             };
 
-            $scope.hostCollectionsTable.working = true;
+            $scope.table.working = true;
             ActivationKey.removeHostCollections({id: $scope.activationKey.id}, data, success, error);
             return deferred.promise;
         };

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

@@ -19,7 +19,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyProductDetail
             if ($scope.details === null) {
                 $scope.details = product;
                 angular.forEach($scope.details['available_content'], function (content) {
-                    override = _.findWhere($scope.activationKey["content_overrides"],
+                    override = _.find($scope.activationKey["content_overrides"],
                                            {"contentLabel": content.content.label, name: "enabled"});
                     if (angular.isUndefined(override)) {
                         content.overrideEnabled = null;

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

@@ -25,23 +25,23 @@ angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptions
         };
 
         $scope.contentNutupane = new Nutupane(ActivationKey, params, "subscriptions");
-        $scope.detailsTable = $scope.contentNutupane.table;
+        $scope.table = $scope.contentNutupane.table;
         $scope.contentNutupane.masterOnly = true;
         $scope.contentNutupane.setSearchKey('subscriptionSearch');
         $scope.isRemoving = false;
 
         $scope.groupedSubscriptions = {};
-        $scope.$watch('detailsTable.rows', function (rows) {
+        $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
         });
 
         $scope.disableRemoveButton = function () {
-            return $scope.detailsTable.numSelected === 0 || $scope.isRemoving;
+            return $scope.table.numSelected === 0 || $scope.isRemoving;
         };
 
         $scope.removeSelected = function () {
             var selected;
-            selected = SubscriptionsHelper.getSelectedSubscriptionAmounts($scope.detailsTable);
+            selected = SubscriptionsHelper.getSelectedSubscriptionAmounts($scope.table);
 
             $scope.isRemoving = true;
             ActivationKey.removeSubscriptions({id: $scope.activationKey.id, 'subscriptions': selected}, function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-add-subscriptions.html

@@ -1,11 +1,8 @@
 <span page-title ng-model="activationKey">{{ 'Add Subscriptions for Activation Key:' | translate }} {{ activationKey.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="messages"></div>
-
-  <div data-block="actions">
-    <div ng-hide="denied('edit_activation_keys', activationKey)" class="nutupane-actions fr">
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
+    <div ng-hide="denied('edit_activation_keys', activationKey)">
        <button class="btn btn-primary"
                translate
                ng-disabled="disableAddButton()"
@@ -19,12 +16,12 @@
      You currently don't have any Products to subscribe to, you can add Products after selecting 'Products' under 'Content' in the main menu
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Products.
   </span>
 
   <div data-block="table">
-    <table ng-class="{'table-mask': detailsTable.working}" class="table table-full">
+    <table ng-class="{'table-mask': table.working}" class="table table-full">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="quantity" sortable class="align-center"><span translate>Quantity</span></th>
@@ -40,11 +37,7 @@
 
       <tbody>
         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
-          <td class="row-select">
-            <a href='/subscriptions/{{ subscription.id }}/info' class='confined-text'>
-              {{ name }}
-            </a>
-          </td>
+          <td bst-table-cell class="row-select" style="white-space:nowrap">{{ name }}</td>
           <td bst-table-cell colspan="8"></td>
         </tr>
         <tr bst-table-row 
@@ -63,7 +56,11 @@
               <option value="">{{ "Automatic" | translate }}</option>
             </select>
           </td>
-          <td bst-table-cell>{{ subscription | subscriptionConsumedFilter }}</td>
+          <td bst-table-cell>
+            <a href='/subscriptions/{{ subscription.id }}/info' class="confined-text">
+              {{ subscription | subscriptionConsumedFilter }}
+            </a>
+          </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>{{ subscription.end_date | date:"shortDate" }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html

@@ -1,21 +1,16 @@
 <span page-title ng-model="activationKey">{{ 'Content Hosts for Activation Key:' | translate }} {{ activationKey.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="messages"></div>
-  <div data-block="actions"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
     This activation key is not associated with any content hosts.
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Hosts.
   </span>
 
   <div data-block="table">
-    <table class="table table-bordered table-striped" bst-table="table" ng-class="{'table-mask': detailsTable.working}">
+    <table class="table table-bordered table-striped" bst-table="table" ng-class="{'table-mask': table.working}">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name" sortable><span translate>Name</span></th>
@@ -30,10 +25,10 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="host in detailsTable.rows"
+        <tr bst-table-row ng-repeat="host in table.rows"
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
-            <a ui-sref="content-hosts.details.info({hostId: host.host_id})">
+            <a ui-sref="content-hosts.details.info({hostId: host.id})">
               {{ host.name }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-copy.html

@@ -0,0 +1,17 @@
+<h5 translate>Create a copy of {{ activationKey.name }}</h5>
+
+<div class="row">
+  <div class="col-sm-4">
+    <form name="copyActivationKeyForm">
+      <div class="form-group">
+        <label for="copy_name" translate>New Name:</label>
+        <input id="copy_name" class="form-control" name="copy_name"
+               ng-model="copyName" tabindex="1" autofocus required/>
+      </div>
+
+      <button class="btn btn-default" type="submit" ng-click="copy(copyName)">
+        <span translate>Create</span>
+      </button>
+    </form>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html

@@ -1,117 +1,87 @@
 <span page-title ng-model="activationKey">{{ 'Activation Key:' | translate }} {{ activationKey.name }}</span>
 
-<div data-extend-template="layouts/panel.html">
-  <div data-block="panel">
-    <section class="nutupane-details" ng-cloak bst-container-scroll>
-      <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    <h2>{{ activationKey.name }}</h2>
+  </header>
 
-      <div ng-hide="panel.error">
-        <header class="details-header">
-          <h2 class="pull-left" translate>Activation Key: {{ activationKey.name }}</h2>
+  <div data-block="item-actions">
+    <div class="dropdown dropdown-kebab-pf pull-right" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
+      <button class="btn btn-link" uib-dropdown-toggle>
+        <span class="fa fa-ellipsis-v"></span>
+      </button>
 
-          <div class="details-actions pull-right">
-            <button class="btn btn-default"
-                    ng-click="openModal()" ng-hide="denied('destroy_activation_keys', activationKey)" translate>
-              Remove
-            </button>
+      <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
+        <li role="menuitem" ng-hide="denied('create_activation_key')">
+          <a ui-sref="activation-key.copy" translate>
+            Copy Activation Key
+          </a>
+        </li>
 
-            <!-- RFE copy activation key - http://projects.theforeman.org/issues/4407 -->
-            <button class="btn btn-default"
-                    ng-click="showCopy = true"
-                    ng-hide="denied('create_activation_key')">
-              <i class="fa fa-copy"></i>
-              {{ "Copy Activation Key" | translate }}
-            </button>
+        <li class="divider"></li>
 
-            <button class="btn btn-default" ui-sref="activation-keys.index">
-              <i class="fa fa-remove"></i>
-              {{ "Close" | translate }}
-            </button>
+        <li role="menuitem" ng-hide="denied('destroy_activation_keys', activationKey)">
+          <a ng-click="openModal()" translate>
+            Remove
+          </a>
+        </li>
+      </ul>
 
-            <div bst-modal="removeActivationKey(activationKey)" model="activationKey">
-              <div data-block="modal-header" translate>Remove Activation Key "{{ activationKey.name }}"?</div>
-              <div data-block="modal-body" translate>Are you sure you want to remove Activation Key "{{ activationKey.name }}"?</div>
-            </div>
-          </div>
-        </header>
-
-        <div ng-show="showCopy" class="pull-right action-pane" >
-          <form>
-            <h5 translate>Copy</h5>
-            <div class="input">
-              <div bst-alerts error-messages="copyErrorMessages"></div>
-              <div class="info-label">
-                <label for="copy_name" translate>New Name:</label>
-              </div>
-              <input ng-model="copyName"
-                     id="copy_name"
-                     name="copy_name"
-                     tabindex="1"
-                     autofocus
-                     required/>
-              <div>
-                <button class="btn btn-default" ng-click="copy(copyName)">
-                  {{ "Create" | translate }}
-                </button>
-                <button class="btn btn-default" ng-click="showCopy = false">
-                  {{ "Cancel" | translate }}
-                </button>
-              </div>
-            </div>
-          </form>
-        </div>
-
-        <nav>
-          <ul class="nav nav-tabs">
-            <li ng-class="{active: isState('activation-keys.details.info')}">
-              <a ui-sref="activation-keys.details.info">
-                <span translate>
-                  Details
-                </span>
-              </a>
-            </li>
-            <li ng-class="{active: stateIncludes('activation-keys.details.subscriptions')}">
-              <a ui-sref="activation-keys.details.subscriptions.list">
-                <span translate>
-                  Subscriptions
-                </span>
-              </a>
-            </li>
-            <li ng-class="{active: stateIncludes('activation-keys.details.products')}">
-              <a ui-sref="activation-keys.details.products">
-                <span translate>
-                  Product Content
-                </span>
-              </a>
-            </li>
-            <li ng-class="{active: stateIncludes('activation-keys.details.host-collections')}">
-              <a ui-sref="activation-keys.details.host-collections.list">
-                <span translate>
-                  Host Collections
-                </span>
-              </a>
-            </li>
-            <li class="dropdown"
-                ng-class="{active: stateIncludes('activation-keys.details.associations-content-hosts')}">
-              <a class="dropdown-toggle">
-                <span translate>Associations</span>
-                <i class="fa fa-chevron-down"></i>
-              </a>
-              <ul class="dropdown-menu">
-                <li>
-                  <a ui-sref="activation-keys.details.associations-content-hosts({activationKeyId: activationKey.id})" translate>
-                    Content Hosts
-                  </a>
-                </li>
-              </ul>
-            </li>
-          </ul>
-        </nav>
-
-        <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
-        <section class="nutupane-sub-section" ui-view></section>
+      <div bst-modal="removeHostCollection(hostCollection)" model="hostCollection">
+        <div data-block="modal-header" translate>Remove Host Collection "{{ hostCollection.name }}"?</div>
+        <div data-block="modal-body" translate>Are you sure you want to remove Host Collection "{{ hostCollection.name }}"?</div>
       </div>
-    </section>
+    </div>
   </div>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs details-nav">
+      <li ng-class="{active: isState('activation-key.info')}">
+        <a ui-sref="activation-key.info">
+          <span translate>
+            Details
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: stateIncludes('activation-key.subscriptions')}">
+        <a ui-sref="activation-key.subscriptions.list">
+          <span translate>
+            Subscriptions
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: stateIncludes('activation-key.products')}">
+        <a ui-sref="activation-key.products">
+          <span translate>
+            Product Content
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: stateIncludes('activation-key.host-collections')}">
+        <a ui-sref="activation-key.host-collections.list">
+          <span translate>
+            Host Collections
+          </span>
+        </a>
+      </li>
+      <li class="dropdown" uib-dropdown
+          ng-class="{active: stateIncludes('activation-key.associations-content-hosts')}">
+        <a uib-dropdown-toggle>
+          <span translate>Associations</span>
+          <i class="fa fa-chevron-down"></i>
+        </a>
+        <ul class="dropdown-menu" uib-dropdown-menu>
+          <li>
+            <a ui-sref="activation-key.associations-content-hosts({activationKeyId: activationKey.id})" translate>
+              Content Hosts
+            </a>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </nav>
+
+  <section data-block="content">
+    <div ui-view></div>
+  </section>
 </div>