katello 3.6.0.1.rc2 → 3.7.0.rc1

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

@@ -2,6 +2,15 @@
   <h4 data-block="modal-header">Content Host Errata Management</h4>
 
   <div data-block="modal-body">
+    <form id="errataActionForm" name="errataActionForm" class="form" method="post" action="/katello/remote_execution">
+      <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
+      <input type="hidden" name="remote_action" ng-value="errataActionFormValues.remoteAction"/>
+      <input type="hidden" name="scoped_search" ng-value="errataActionFormValues.search"/>
+      <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
+      <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
+      <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
+    </form>
+
     <div bst-alert="info" ng-show="showConfirm">
       <span translate>
         Are you sure you want to apply the {{ table.numSelected }} selected errata to the content hosts chosen?
@@ -18,7 +27,7 @@
       </div>
     </div>
 
-    <div data-extend-template="layouts/partials/table.html">
+    <div ng-show="showTable()" data-extend-template="layouts/partials/table.html">
       <div data-block="search">
         <input type="text" class="form-control" stop-event="click"
                placeholder="{{ 'Filter...' | translate }}"
@@ -44,6 +53,7 @@
                   type="button" id="use-remote-execution">
             <span class="caret"></span>
           </button>
+          
           <ul uib-dropdown-menu class="dropdown-menu-right" role="menu" aria-labelledby="use-remote-execution">
             <li role="presentation"><a ng-click="installErrataViaKatelloAgent()" role="menuitem" translate>via Katello agent</a></li>
             <li role="presentation"><a ng-click="installErrataViaRemoteExecution(false)" role="menuitem" translate>via remote execution</a></li>
@@ -95,6 +105,103 @@
         </table>
       </div>
     </div>
+
+    <div name="errataDetails" ng-show="showErrata">
+      <a ng-click="showErrata = false">
+        <i class="fa fa-double-angle-left"></i>
+        {{ "Back To Errata List" | translate }}
+      </a>
+
+      <h3>{{ 'Errata Details' | translate }}</h3>
+
+      <h3>{{ erratum.errata_id }} </h3>
+
+      <div class="details details-full">
+        <section>
+
+          <div class="detail">
+            <span class="info-label" translate>Type</span>
+            <span class="info-value">{{ erratum.type }}</span>
+          </div>
+          <div class="detail">
+            <span class="info-label" translate>Title</span>
+            <span class="info-value">{{ erratum.title }}</span>
+          </div>
+          <div class="detail">
+            <span class="info-label" translate>Issued</span>
+            <span class="info-value">{{ erratum.issued }}</span>
+          </div>
+          <div class="detail">
+            <span class="info-label" translate>Updated</span>
+            <span class="info-value">{{ erratum.updated }}</span>
+          </div>
+          <div class="detail">
+            <span class="info-label" translate>Reboot Suggested</span>
+            <span class="info-value">{{ erratum.reboot_suggested }}</span>
+          </div>
+
+          <div class="detail">
+            <span class="info-label" translate>Description</span>
+            <span class="info-value">
+        <p ng-repeat="paragraph in erratum.description.split('\n\n')">
+          {{ paragraph }}
+        </p>
+      </span>
+          </div>
+
+          <div class="detail">
+            <span class="info-label" translate>Solution</span>
+            <span class="info-value">
+        <p ng-repeat="paragraph in erratum.solution.split('\n\n')">
+          {{ paragraph }}
+        </p>
+      </span>
+          </div>
+
+          <div class="detail">
+            <span class="info-label" translate>Packages</span>
+            <span class="info-value">
+        <ul>
+          <li ng-repeat="package in erratum.packages">
+            {{ package }}
+          </li>
+        </ul>
+      </span>
+          </div>
+
+        </section>
+      </div>
+  </div>
+
+    <div name="errataHostsDetails" ng-show="showHosts">
+      <a ng-click="showHosts = false">
+        <i class="fa fa-double-angle-left"></i>
+        {{ "Back To Errata List" | translate }}
+      </a>
+
+      <h3 translate>Applicable hosts for {{ erratum.errata_id }} </h3>
+
+      <div class="details details-full">
+        <section>
+          <table class="table">
+            <thead>
+            <tr>
+              <th translate>
+                Name
+              </th>
+            </tr>
+            </thead>
+
+            <tbody>
+            <tr ng-repeat="host in erratum.applicable_hosts">
+              <td>{{ host.name }}</td>
+            </tr>
+            </tbody>
+          </table>
+        </section>
+      </div>
+    </div>
+
   </div>
 
   <div data-block="modal-footer">

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

@@ -66,12 +66,12 @@
           <tbody>
             <tr bst-table-row ng-repeat="hostCollection in table.rows" row-select="hostCollection">
               <td bst-table-cell>
-                <a ui-sref="host-collection.info({hostCollectionId: hostCollection.id})">
+                <a ng-click="ok(); " ui-sref="host-collection.info({hostCollectionId: hostCollection.id})" >
                   {{ hostCollection.name }}
                 </a>
               </td>
               <td bst-table-cell>
-                <a ui-sref="host-collection.content-hosts({hostCollectionId: hostCollection.id})">
+                <a ng-click="ok();"  ui-sref="host-collection.hosts.list({hostCollectionId: hostCollection.id})">
                   {{ hostCollection.total_hosts }}
                 </a>
               </td>

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

@@ -30,14 +30,14 @@
       </ul>
     </span>
 
-    <div ng-form id="packageActionForm" name="packageActionForm" class="form" method="post" action="/katello/remote_execution">
+    <form id="packageActionForm" name="packageActionForm" class="form" method="post" action="/katello/remote_execution">
       <input type="hidden" name="name" ng-value="content.content"/>
       <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
       <input type="hidden" name="scoped_search" ng-value="packageActionFormValues.search"/>
       <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
       <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
       <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
-    </div>
+    </form>
 
     <div ng-form name="systemContentForm" class="form" ng-hide="content.workingMode || denied('edit_hosts')" novalidate>
       <div>

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

@@ -80,7 +80,7 @@
             <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
               <td class="row-select"></td>
               <td colspan="8">
-                <a ui-sref="subscription.info({subscriptionId: subscription.id})" class="confined-text">
+                <a ng-click="ok();"  ui-sref="subscription.info({subscriptionId: subscription.id})" class="confined-text">
                   {{ name }}
                 </a>
               </td>

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

@@ -47,7 +47,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
         };
 
         $scope.selectedErrataOption = 'current';
-        $scope.errataOptions = [{name: "Current Environment", label: 'current'}, {name: 'foo', label: 'bar'}];
+        $scope.errataOptions = [{name: "Current Lifecycle Environment", label: 'current'}, {name: 'foo', label: 'bar'}];
 
         $scope.table.initialLoad = false;
 
@@ -57,12 +57,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
                 previousEnv;
 
             if (host.hasContent()) {
-                currentEnv = translate("Current Environment (%e/%cv)").replace("%e", host.content_facet_attributes.lifecycle_environment.name).replace("%cv", host.content_facet_attributes.content_view_name);
+                currentEnv = translate("Current Lifecycle Environment (%e/%cv)").replace("%e", host.content_facet_attributes.lifecycle_environment.name).replace("%cv", host.content_facet_attributes.content_view_name);
                 $scope.errataOptions = [{name: currentEnv, label: 'current', order: 3}];
 
                 if (!host['content_facet_attributes']['lifecycle_environment_library?']) {
                     Environment.get({id: host['content_facet_attributes'].lifecycle_environment.id}).$promise.then(function (env) {
-                        previousEnv = translate("Previous Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_facet_attributes.content_view_name);
+                        previousEnv = translate("Previous Lifecycle Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_facet_attributes.content_view_name);
                         $scope.errataOptions.push({name: previousEnv,
                                                    label: 'prior', order: 2, 'content_view_id': host.content_facet_attributes.content_view_id, 'environment_id': env.prior.id});
 

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

@@ -31,27 +31,27 @@
     </p>
   </div>
 
+  <form id="errataActionForm" method="post" action="/katello/remote_execution">
+    <input type="hidden" name="remote_action" value="errata_install"/>
+    <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
+    <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
+    <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
+    <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
+  </form>
+
   <div data-extend-template="layouts/partials/table.html">
     <span data-block="search-filter" bst-feature-flag="remote_actions">
       <label class="sr-only" translate>
         Limit to environment
       </label>
       <select class="form-control"
-              placeholder="{{ 'Limit to Environment' | translate }}"
+              placeholder="{{ 'Limit to Lifecycle Environment' | translate }}"
               ng-model="selectedErrataOption"
               ng-change="refreshErrata(selectedErrataOption)"
               ng-options="option.label as option.name for option in errataOptions | orderBy: 'order'">
       </select>
     </span>
 
-    <form id="errataActionForm" method="post" action="/katello/remote_execution">
-      <input type="hidden" name="remote_action" value="errata_install"/>
-      <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
-      <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
-      <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
-      <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
-    </form>
-
     <span data-block="list-actions" ng-hide="contentHost.readonly">
       <div bst-modal="applySelected()" model="host">
         <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.name}}"?</div>

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

@@ -58,7 +58,7 @@
 
       <tbody>
         <tr bst-table-row ng-repeat="package in table.rows" row-select="package">
-          <td bst-table-cell>{{ package.nvra }}</td>
+          <td bst-table-cell>{{ package.nvrea }}</td>
         </tr>
       </tbody>
     </table>

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

@@ -42,7 +42,7 @@
 
       <tbody>
         <tr bst-table-row ng-repeat="package in table.rows" row-select="package">
-          <td bst-table-cell>{{ package.nvra }}</td>
+          <td bst-table-cell>{{ package.nvrea }}</td>
         </tr>
       </tbody>
     </table>

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

@@ -31,7 +31,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
         $scope.nutupane.setSearchKey('subscriptionSearch');
         $scope.nutupane.masterOnly = true;
         $scope.table = $scope.nutupane.table;
-
+        $scope.contextAdd = true;
         $scope.isAdding = false;
         $scope.groupedSubscriptions = {};
 
@@ -40,7 +40,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
         });
 
         $scope.getAmountSelectorValues = SubscriptionsHelper.getAmountSelectorValues;
-
         $scope.showMatchHost = false;
         $scope.showMatchInstalled = false;
         $scope.showNoOverlap = false;

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

@@ -29,7 +29,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
         $scope.table = $scope.nutupane.table;
         $scope.nutupane.masterOnly = true;
         $scope.isRemoving = false;
-
+        $scope.contextAdd = false;
         $scope.groupedSubscriptions = {};
         $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);

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

@@ -108,7 +108,7 @@
         <ul uib-dropdown-menu>
           <li>
             <a ui-sref="content-host.packages.actions" translate>
-              Yum Actions
+              Actions
             </a>
           </li>
           <li>

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

@@ -203,19 +203,19 @@
         </dd>
 
         <dt bst-feature-flag="lifecycle_environments">
-          <span translate>Environment</span>
+          <span translate>Lifecycle Environment</span>
         </dt>
         <dd bst-feature-flag="lifecycle_environments">
           <div bst-alert="info" ng-show="editContentView">
             <p translate ng-show="contentViews.length === 0">
-              The host requires being attached to a content view and the environment you have chosen has no content views promoted to it.
+              The host requires being attached to a content view and the lifecycle environment you have chosen has no content views promoted to it.
               See the <a href="/content_views">content views page</a> to manage and promote a content view.
             </p>
             <p translate ng-show="contentViews.length !== 0">
-              You must select a new content view before your change of environment can be saved.
+              You must select a new content view before your change of lifecycle environment can be saved.
             </p>
             <p translate>
-              Use the cancel button on content view selection to revert your environment selection.
+              Use the cancel button on content view selection to revert your lifecycle environment selection.
             </p>
           </div>
 

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

@@ -28,7 +28,7 @@
       </label>
       <label class="checkbox-inline" title="{{ 'Limit Repository Sets to only those available in this Host\'s Lifecycle Environment' | translate }}">
         <input type="checkbox" ng-model="contentAccessModes.contentAccessModeEnv" ng-change="toggleFilters()"/>
-        <span translate>Limit to Environment</span>
+        <span translate>Limit to Lifecycle Environment</span>
       </label>
     </div>
 

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

@@ -77,7 +77,7 @@
             <span translate>Installable Updates</span>
           </th>
           <th bst-table-column="os" sortable><span translate>OS</span></th>
-          <th bst-table-column="lifecycle_environment" sortable><span sortable translate>Environment</span></th>
+          <th bst-table-column="lifecycle_environment" sortable><span sortable translate>Lifecycle Environment</span></th>
           <th bst-table-column="content_view" sortable><span translate>Content View</span></th>
           <th bst-table-column="registered_at" sortable><span translate>Registered</span></th>
           <th bst-table-column="last_checkin" sortable><span translate>Last Checkin</span></th>

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

@@ -15,17 +15,27 @@
       </li>
       <li>
         <p translate>Install the pre-built bootstrap RPM:</p>
-        <pre><code>rpm -Uvh http://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/{{ consumerCertRPM }}</code></pre>
+        <pre><code>rpm -Uvh https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/{{ consumerCertRPM }}</code></pre>
       </li>
       <li>
-        <p translate>Run subscription-manager in a console on the client host.  You may use an Activation Key to register:</p>
+        <p translate>Register using subscription-manager:</p>
+        <p translate>Using an Activation Key:</p>
         <pre><code>subscription-manager register --org="{{ organization.label }}" --activationkey="&ltActivation Key Name&gt"</code></pre>
-        <p translate>or authenticate with a username and password:</p>
+        <p translate>Using a username and password:</p>
         <pre><code>subscription-manager register --org="{{ organization.label }}" --environment="Library"</code></pre>
       </li>
       <li>
-        <p translate>Install katello-agent for remote actions and displaying errata information:</p>
+        <p translate>Install client package:</p>
+
+        <p translate>To report package & errata information:</p>
+        <pre><code>yum -y install katello-host-tools</code></pre>
+
+        <p translate>To optionally report tracer information:</p>
+        <pre><code>yum -y install katello-host-tools-tracer</code></pre>
+
+        <p translate>For remote actions and reporting package & errata information:</p>
         <pre><code>yum -y install katello-agent</code></pre>
+        <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
       </li>
     </ol>
   </div>

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

@@ -14,7 +14,7 @@
 angular.module('Bastion.content-views').controller('ContentViewCompositeAvailableContentViewsController',
     ['$scope', 'Nutupane', 'CurrentOrganization', 'ContentView', 'ContentViewComponent',
         function ($scope, Nutupane, CurrentOrganization, ContentView, ContentViewComponent) {
-            var nutupane, params;
+            var nutupane, params, nutupaneParams;
 
             params = {
                 'full_result': true,
@@ -23,10 +23,13 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeAvailabl
                 'organization_id': CurrentOrganization
             };
 
-            nutupane = new Nutupane(ContentView, params);
+            nutupaneParams = {
+                'disableAutoLoad': true
+            };
+
+            nutupane = new Nutupane(ContentView, params, undefined, nutupaneParams);
             $scope.controllerName = 'katello_content_views';
             nutupane.masterOnly = true;
-            nutupane.table.initialLoad = false;
             $scope.table = nutupane.table;
 
             $scope.contentView.$promise.then(function (contentView) {
@@ -41,7 +44,7 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeAvailabl
                 params['without[]'] = filterIds;
 
                 nutupane.setParams(params);
-                nutupane.load(true);
+                nutupane.refresh();
             });
 
             $scope.addContentViews = function () {

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

@@ -14,7 +14,9 @@
      *    Provides UI functionality add deb repositories to a content view
      */
     function ContentViewAvailableDebRepositoriesController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -25,7 +27,7 @@
             'content_view_id': $scope.$stateParams.contentViewId,
             'available_for': 'content_view'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.load();

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

@@ -15,7 +15,9 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableDockerRe
     ['$scope', 'Repository', 'Nutupane', 'CurrentOrganization', 'ContentViewRepositoriesUtil',
     function ($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
 
-        var nutupane;
+        var nutupane, nutupaneParams = {
+            'disableAutoLoad': true
+        };
 
         ContentViewRepositoriesUtil($scope);
 
@@ -26,11 +28,11 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableDockerRe
             'content_view_id': $scope.$stateParams.contentViewId,
             'available_for': 'content_view'
         },
-        'queryUnpaged');
+        'queryUnpaged', nutupaneParams);
         $scope.controllerName = 'katello_repositories';
 
         nutupane.masterOnly = true;
-
+        nutupane.load();
         $scope.table = nutupane.table;
 
         $scope.addRepositories = function (contentView) {