katello 3.6.0.1.rc2 → 3.7.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-details.html

@@ -0,0 +1,36 @@
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    <h2 translate>{{ contentCredential.name }}</h2>
+  </header>
+
+  <div data-block="item-actions">
+    <button type="button" class="btn btn-default" ng-click="openModal()" ng-hide="denied('destroy_content_credentials', contentCredential)">
+      <span translate>Remove Content Credential</span>
+    </button>
+
+    <div bst-modal="removeContentCredential(contentCredential)" model="contentCredential">
+      <div data-block="modal-header" translate>Remove Content Credential {{ contentCredential.name }}</div>
+      <div data-block="modal-body" translate>Are you sure you want to remove Content Credential {{ contentCredential.name }}?</div>
+    </div>
+  </div>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs details-nav">
+      <li ng-class="{active: isState('content-credential.info')}">
+        <a ui-sref="content-credential.info" translate>Details</a>
+      </li>
+
+      <li ng-class="{active: stateIncludes('content-credential.products')}">
+        <a ui-sref="content-credential.products" translate>Products</a>
+      </li>
+
+      <li ng-class="{active: stateIncludes('content-credential.repositories')}">
+        <a ui-sref="content-credential.repositories" translate>Repositories</a>
+      </li>
+    </ul>
+  </nav>
+
+  <div data-block="content">
+    <section ui-view></section>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/{gpg-keys/details/views/gpg-key-info.html → content-credentials/details/views/content-credential-info.html}

@@ -3,15 +3,18 @@
   <div class="col-sm-12">
     <dl class="dl-horizontal dl-horizontal-left">
       <dt translate>Name</dt>
-      <dd bst-edit-text="gpgKey.name"
-          on-save="save(gpgKey)"
-          readonly="denied('edit_gpg_keys', gpgKey)">
+      <dd bst-edit-text="contentCredential.name"
+          on-save="save(contentCredential)"
+          readonly="denied('edit_content_credentials', contentCredential)">
       </dd>
 
+      <dt translate>Type</dt>
+      <dd>{{ contentCredential.content_type | contentTypeFilter }}</dd>
+
       <dt translate>Content</dt>
-      <dd bst-edit-custom="gpgKey.content"
-          readonly="denied('edit_gpg_keys', gpgKey)"
-          on-save="save(gpgKey)">
+      <dd bst-edit-custom="contentCredential.content"
+          readonly="denied('edit_content_credentials', contentCredential)"
+          on-save="save(contentCredential)">
         <form role="form"
               action="{{ uploadURL }}"
               ng-upload="uploadContent(content)"
@@ -20,7 +23,7 @@
               upload-options-enable-rails-csrf>
 
           <div class="form-group">
-            <textarea class="form-control" ng-model="gpgKey.content"></textarea>
+            <textarea class="form-control" ng-model="contentCredential.content"></textarea>
           </div>
 
           <div class="form-group">
@@ -39,17 +42,23 @@
 
       <dt translate>Products</dt>
       <dd>
-        <a ui-sref="gpg-key.products">
-          {{ gpgKey.products.length }}
+        <a ui-sref="content-credential.products">
+          {{ contentCredential.gpg_key_products.length +
+            contentCredential.ssl_ca_products.length +
+            contentCredential.ssl_client_products.length +
+            contentCredential.ssl_key_products.length }}
         </a>
       </dd>
 
       <dt translate>Repositories</dt>
       <dd>
-        <a ui-sref="gpg-key.repositories">
-          {{ gpgKey.repositories.length }}
+        <a ui-sref="content-credential.repositories">
+          {{ contentCredential.gpg_key_repos.length +
+             contentCredential.ssl_ca_repos.length +
+             contentCredential.ssl_client_repos.length +
+             contentCredential.ssl_key_repos.length }}
         </a>
       </dd>
     </dl>
   </div>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/{gpg-keys/details/views/gpg-key-products.html → content-credentials/details/views/content-credential-products.html}

@@ -1,8 +1,8 @@
-<span page-title ng-model="gpgKey">{{ 'Repositories for ' | translate }} {{ gpgKey.name }}</span>
+<span page-title ng-model="contentCredential">{{ 'Repositories for ' | translate }} {{ contentCredential.name }}</span>
 
 <div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
-    You currently don't have any Products associated with this GPG Key.
+    You currently don't have any Products associated with this Content Credential.
   </span>
 
   <div data-block="table">
@@ -10,6 +10,7 @@
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name" sortable><span translate>Name</span></th>
+          <th bst-table-column="used_as" sortable><span translate>Used as</span></th>
           <th bst-table-column class="number-cell" translate>Repositories</th>
         </tr>
       </thead>
@@ -21,6 +22,9 @@
               {{ product.name }}
             </a>
           </td>
+          <td bst-table-cell>
+              {{ product.used_as }}
+          </td>
           <td bst-table-cell class="number-cell">
             <a ui-sref="product.repositories({productId: product.id})">
               {{ product.repository_count }}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/{gpg-keys/details/views/gpg-key-repositories.html → content-credentials/details/views/content-credential-repositories.html}

@@ -1,24 +1,25 @@
-<span page-title ng-model="gpgKey">{{ 'Products for ' | translate }} {{ gpgKey.name }}</span>
+<span page-title ng-model="contentCredential">{{ 'Products for ' | translate }} {{ contentCredential.name }}</span>
 
 <div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
-    You currently don't have any Repositories associated with this GPG Key.
+    You currently don't have any Repositories associated with this Content Credential.
   </span>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered" ng-show="gpgKey.repositories.length > 0">
+      <table class="table table-striped table-bordered">
       <thead>
         <tr>
           <th translate>Name</th>
           <th translate>Product</th>
           <th translate>Type</th>
+          <th translate>Used as</th>
         </tr>
       </thead>
 
       <tbody>
         <tr ng-repeat="repository in table.rows">
           <td>
-            <a ui-sref="repository.info({productId: repository.product.id, repositoryId: repository.id})">{{ repository.name }}</a>
+            <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.id})">{{ repository.name }}</a>
           </td>
           <td>
             <a ui-sref="product.repositories({productId: repository.product.id})">
@@ -26,6 +27,7 @@
             </a>
           </td>
           <td>{{ repository.content_type }}</td>
+          <td>{{ repository.used_as }}</td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/new/new-content-credential.controller.js

@@ -0,0 +1,39 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-credentials.controller:NewContentCredentialController
+ *
+ * @requires $scope
+ * @requires $state
+ * @requires translate
+ * @requires ContentCredential
+ * @requires CurrentOrganization
+ * @requires Notification
+ *
+ * @description
+ *   Controls the creation of an empty ContentCredential object for use by sub-controllers.
+ */
+angular.module('Bastion.content-credentials').controller('NewContentCredentialController',
+    ['$scope', '$state', 'translate', 'ContentCredential', 'CurrentOrganization', 'Notification',
+    function ($scope, $state, translate, ContentCredential, CurrentOrganization, Notification) {
+        $scope.panel = {loading: false};
+        $scope.contentCredential = new ContentCredential();
+        $scope.CurrentOrganization = CurrentOrganization;
+        $scope.progress = {uploading: false};
+        $scope.uploadURL = 'katello/api/v2/content_credentials?organization_id=' + CurrentOrganization;
+
+        $scope.uploadContent = function (response) {
+            if (response) {
+                if (angular.isUndefined(response.errors)) {
+                    $scope.uploadStatus = 'success';
+                    $scope.transitionTo('content-credential.info', {contentCredentialId: response.id});
+                    Notification.setSuccessMessage(translate('Content Credential %s has been created.').replace('%s', response.name));
+                } else {
+                    Notification.setErrorMessage(translate("An error occurred while creating the Content Credential: ") + response.displayMessage);
+                    $scope.uploadStatus = 'error';
+                }
+
+                $scope.progress.uploading = false;
+            }
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/new/views/new-content-credential.html

@@ -0,0 +1,53 @@
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    <h2 translate>Create Content Credential</h2>
+  </header>
+
+  <div data-block="content" class="row">
+    <form name="contentCredentialForm" class="col-sm-5" novalidate role="form"
+          action="{{ uploadURL }}"
+          ng-upload="uploadContent(content)"
+          upload-options-enable-rails-csrf>
+
+      <div bst-form-group label="{{ 'Name' | translate }}">
+        <input id="name"
+               name="name"
+               ng-model="contentCredential.name"
+               type="text"
+               tabindex="1"
+               autofocus
+               required/>
+      </div>
+
+      <div bst-form-group label="{{ 'Type' | translate }}">
+        <select id="content_type"
+                name="content_type"
+                required>
+          <option value="gpg_key" translate>GPG Key</option>
+          <option value="cert" translate>SSL Certificate</option>
+        </select>
+      </div>
+
+      <div bst-form-group label="{{ 'Content Credential Contents' | translate }}">
+        <textarea name="content"
+                  ng-model="contentCredential.pastedContent"
+                  tabindex="1"
+                  class="form-control"
+                  rows="15"
+                  placeholder="{{ 'Paste contents of Content Credential' | translate }}">
+        </textarea>
+      </div>
+
+      <div class="form-group">
+        <input type="file" name="file_path"/>
+        <p class="help-block" translate>Upload Content Credential file</p>
+      </div>
+
+      <div bst-form-buttons upload-submit
+           on-cancel="transitionTo('content-credentials')"
+           ng-disabled="contentCredential.name == undefined"
+           working="progress.uploading">
+      </div>
+    </form>
+  </div>
+</div>

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

@@ -0,0 +1,55 @@
+<span page-title>{{ 'Content Credentials' | translate }}</span>
+
+<div data-extend-template="layouts/table-with-header.html">
+  <div data-block="header">
+    <h2 translate>Content Credentials</h2>
+  </div>
+
+  <div data-block="list-actions">
+    <button type="button" class="btn btn-primary" ui-sref="content-credentials.new" ng-hide="denied('create_content_credentials')">
+      <span translate>Create Content Credential</span>
+    </button>
+  </div>
+
+  <span data-block="no-rows-message" translate>
+    You currently don't have any Content Credential, you can add Content Credentials using the button on the right.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Content Credential.
+  </span>
+
+  <div data-block="table">
+    <table bst-table="table" class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+      <thead>
+      <tr bst-table-head>
+        <th bst-table-column="name" sortable><span translate>Name</span></th>
+        <th bst-table-column="organization"><span translate>Organization</span></th>
+        <th bst-table-column="content_type"><span translate>Type</span></th>
+        <th bst-table-column="products" class="number-cell"><span translate>Product Count</span></th>
+        <th bst-table-column class="number-cell"><span translate>Repository Count</span></th>
+      </tr>
+      </thead>
+
+      <tbody>
+      <tr bst-table-row ng-repeat="contentCredential in table.rows">
+        <td bst-table-cell>
+          <a ui-sref="content-credential.info({contentCredentialId: contentCredential.id})">{{ contentCredential.name }}</a>
+        </td>
+        <td bst-table-cell>{{ contentCredential.organization.name }}</td>
+        <td bst-table-cell>{{ contentCredential.content_type | contentTypeFilter }}</td>
+        <td bst-table-cell class="number-cell">{{ contentCredential.gpg_key_products.length +
+            contentCredential.ssl_ca_products.length +
+            contentCredential.ssl_client_products.length +
+            contentCredential.ssl_key_products.length || 0 }}</td>
+        <td bst-table-cell class="number-cell">{{ contentCredential.gpg_key_repos.length +
+            contentCredential.ssl_ca_repos.length +
+            contentCredential.ssl_client_repos.length +
+            contentCredential.ssl_key_repos.length || 0 }}
+        </td>
+      </tr>
+      </tbody>
+    </table>
+
+  </div>
+</div>

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

@@ -6,6 +6,7 @@
  * @requires $http
  * @requires $location
  * @requires $window
+ * @requires $timeout
  * @requires $uibModalInstance
  * @requires HostBulkAction
  * @requires HostCollection
@@ -20,8 +21,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', 'Notification', 'BastionConfig', 'hostIds',
-    function ($scope, $http, $location, $window, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds) {
+    ['$scope', '$http', '$location', '$window', '$timeout', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'Notification', 'BastionConfig', 'hostIds',
+    function ($scope, $http, $location, $window, $timeout, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds) {
         var nutupane;
 
         function installParams() {
@@ -39,7 +40,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         nutupane = new Nutupane(HostBulkAction, hostIds, 'installableErrata');
         $scope.controllerName = 'katello_errata';
         nutupane.masterOnly = true;
-
+        $scope.showErrata = false;
+        $scope.showHosts = false;
         $scope.table = nutupane.table;
         $scope.table.errataFilterTerm = "";
         $scope.table.initialLoad = false;
@@ -47,6 +49,19 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
 
+        $scope.errataActionFormValues = {
+            authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
+            search: hostIds.included.search
+        };
+
+        if (hostIds.included.ids) {
+            $scope.errataActionFormValues.hostIds = hostIds.included.ids.join(',');
+        }
+
+        $scope.showTable = function () {
+            return (!$scope.showErrata && !$scope.showHosts);
+        };
+
         $scope.fetchErrata = function () {
             var params = hostIds;
             params['organization_id'] = CurrentOrganization;
@@ -63,14 +78,16 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
 
         $scope.transitionToErrata = function (erratum) {
             fetchErratum(erratum['errata_id']);
-            $scope.transitionTo('content-hosts.bulk-actions.errata.details', {errataId: erratum['errata_id']});
+            $scope.erratum = erratum;
+            $scope.showErrata = true;
         };
 
         $scope.transitionToErrataContentHosts = function (erratum) {
             $scope.erratum = erratum;
-            $scope.transitionTo('content-hosts.bulk-actions.errata.content-hosts', {errataId: erratum['errata_id']});
+            $scope.showHosts = true;
         };
 
+
         $scope.installErrata = function () {
             if ($scope.remoteExecutionByDefault) {
                 $scope.installErrataViaRemoteExecution();
@@ -95,20 +112,15 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         };
 
         $scope.installErrataViaRemoteExecution = function(customize) {
-            var formData = {},
-                errataIds = _.map($scope.table.getSelected(), 'errata_id'),
-                selectedHosts = hostIds;
-
-            formData.authenticityToken = $window.AUTH_TOKEN.replace(/"/g, '');
-            formData.remoteAction = 'errata_install';
-            formData.errata = errataIds.join(',');
-            formData.hostIds = selectedHosts.included.ids.join(',');
-            formData.search = selectedHosts.included.search;
-            formData.customize = customize;
-
-            $http.post('katello/remote_execution', formData, {
-                headers: {'Content-Type': 'application/x-www-form-urlencoded'
-            }});
+            var errataIds = _.map($scope.table.getSelected(), 'errata_id');
+
+            $scope.errataActionFormValues.remoteAction = 'errata_install';
+            $scope.errataActionFormValues.errata = errataIds.join(',');
+            $scope.errataActionFormValues.customize = customize;
+
+            $timeout(function () {
+                angular.element('#errataActionForm').submit();
+            }, 0);
         };
 
         $scope.ok = function () {

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

@@ -38,7 +38,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkHostCollecti
         nutupane.masterOnly = true;
 
         $scope.table = nutupane.table;
-
         $scope.confirmHostCollectionAction = function (action) {
             $scope.hostCollections.confirm = true;
             $scope.hostCollections.action = action;

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

@@ -134,7 +134,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
                 $scope.packageActionFormValues.remoteAction = 'package_' + action;
             }
 
-            $scope.packageActionFormValues.hostIds = selectedHosts.included.ids.join(',');
+            if (selectedHosts.included.ids) {
+                $scope.packageActionFormValues.hostIds = selectedHosts.included.ids.join(',');
+            }
+
             $scope.packageActionFormValues.search = selectedHosts.included.search;
 
             $timeout(function () {

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

@@ -2,7 +2,7 @@
   <h4 data-block="modal-header" translate>Content Host Bulk Content</h4>
 
   <div data-block="modal-body">
-    <h4 translate>Assign Environment and Content View</h4>
+    <h4 translate>Assign Lifecycle Environment and Content View</h4>
 
     <div class="row">
       <div class="col-sm-12">
@@ -63,4 +63,4 @@
       Done
     </button>
   </div>
-</div>
+</div>