katello 3.3.2 → 3.4.0.rc1

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

@@ -11,7 +11,7 @@
     </span>
   </p>
   <section>
-    <div class="nutupane-details-bar row">
+    <div class="row">
       <form ng-submit="performPackageAction(packageAction.actionType, packageAction.term)" role="form">
 
         <div class="form-group col-sm-2">
@@ -32,7 +32,7 @@
                    ng-model="packageAction.term"/>
 
             <span uib-dropdown class="input-group-btn">
-              <button class="btn btn-default"
+              <button class="btn btn-default" type="button"
                       ng-hide="denied('edit_hosts', host)"
                       ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
                       translate>
@@ -54,7 +54,7 @@
         </div>
 
         <div class="form-group">
-          <button class="btn btn-primary"
+          <button class="btn btn-primary" type="button"
                   translate
                   ng-disabled="working"
                   ng-click="updateAll()">

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

@@ -1,8 +1,8 @@
 <span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
 
-<h4 translate>Applicable Packages</h4>
+<h3 translate>Applicable Packages</h3>
 
-<div data-extend-template="layouts/details-nutupane.html">
+<div data-extend-template="layouts/partials/table.html">
 
   <span data-block="no-rows-message" translate>
     The host has not reported any applicable packages for upgrade.
@@ -17,15 +17,15 @@
       <form ng-submit="performDefaultUpdateAction()" role="form">
 
         <span uib-dropdown class="btn-group">
-          <button class="btn btn-default"
+          <button class="btn btn-default" type="button"
                   ng-hide="denied('edit_hosts', host)"
-                  ng-disabled="working || detailsTable.numSelected === 0"
+                  ng-disabled="working || table.numSelected === 0"
                   translate>
             Upgrade Selected
           </button>
           <button uib-dropdown-toggle class="btn btn-default"
                   ng-hide="!remoteExecutionPresent || denied('edit_hosts', contentHost)"
-                  ng-disabled="working ||  detailsTable.numSelected === 0"
+                  ng-disabled="working ||  table.numSelected === 0"
                   type="button" id="use-remote-execution">
             <span class="caret"></span>
           </button>
@@ -37,6 +37,7 @@
         </span>
 
         <button class="btn btn-primary"
+                type="button"
                 translate
                 ng-disabled="working"
                 ng-click="updateAll()">
@@ -47,7 +48,7 @@
   </div>
 
   <div data-block="table">
-    <table ng-class="{'table-mask': detailsTable.working}" class="table table-full table-striped">
+    <table bst-table="table" ng-class="{'table-mask': table.working}" class="table table-full table-striped">
       <thead>
       <tr bst-table-head row-select>
         <th bst-table-column="name" translate>Upgradable Package</th>
@@ -55,7 +56,7 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="package in detailsTable.rows" row-select="package">
+        <tr bst-table-row ng-repeat="package in table.rows" row-select="package">
           <td bst-table-cell>{{ package.nvra }}</td>
         </tr>
       </tbody>

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

@@ -11,9 +11,9 @@
   </p>
 </section>
 
-<h4 translate>Installed Packages</h4>
+<h3 translate>Installed Packages</h3>
 
-<div data-extend-template="layouts/details-nutupane.html">
+<div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
     The host has not reported any installed packages, registering with subscription-manager should cause these to be reported.
   </span>
@@ -22,19 +22,18 @@
     Your search returned zero Packages.
   </span>
 
-  <div data-block="actions" bst-feature-flag="remote_actions">
-    <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
-      <button class="btn btn-primary"
-              translate
-              ng-disabled="working || detailsTable.numSelected === 0"
-              ng-click="removeSelectedPackages()">
-        {{ 'Remove Selected' | translate }}
-      </button>
-    </div>
+  <div data-block="list-actions" bst-feature-flag="remote_actions">
+    <button class="btn btn-default" type="button"
+            ng-hide="denied('edit_hosts', host)"
+            ng-disabled="working || table.numSelected === 0"
+            ng-click="removeSelectedPackages()">
+      <span translate>Remove Selected</span>
+    </button>
   </div>
 
   <div data-block="table">
-    <table ng-class="{'table-mask': detailsTable.working}" class="table table-full table-striped">
+    <table bst-table="table" ng-class="{'table-mask': table.working}"
+           class="table table-striped table-bordered">
       <thead>
       <tr bst-table-head row-select>
         <th bst-table-column="name" translate>Installed Package</th>
@@ -42,7 +41,7 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="package in detailsTable.rows" row-select="package">
+        <tr bst-table-row ng-repeat="package in table.rows" row-select="package">
           <td bst-table-cell>{{ package.nvra }}</td>
         </tr>
       </tbody>

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

@@ -1,11 +1,11 @@
 <span page-title ng-model="host">{{ 'Traces for: ' | translate }} {{ host.name }}</span>
 
-<div class="details fl" ng-hide="host.hasContent()">
+<div ng-hide="host.hasContent()">
   <div data-extend-template="common/views/registration.html"></div>
 </div>
 
 <div ng-if="host && host.hasContent()" ng-hide="denied('edit_hosts', host)">
-  <div data-block="messages" ng-show="detailsTable.rows.length > 0">
+  <div data-block="messages" ng-show="table.rows.length > 0">
     <p bst-alert="info" >
       <span translate ng-show="remoteExecutionPresent">
         Only the Applications with a Helper can be restarted.
@@ -24,37 +24,45 @@
     <input type="hidden" name="authenticity_token" ng-value="traceActionFormValues.authenticityToken"/>
   </form>
 
-  <div data-extend-template="layouts/details-nutupane.html">
-    <div data-block="header" bst-feature-flag="remote_actions">
-      <span translate>Traces</span>
-    </div>
+  <div bst-feature-flag="remote_actions">
+    <h3 translate>Traces</h3>
+  </div>
 
-    <span data-block="actions" ng-hide="contentHost.readonly">
+  <div data-extend-template="layouts/partials/table.html">
+    <span data-block="list-actions" ng-hide="contentHost.readonly">
       <div bst-modal="performViaRemoteExecution(false)" model="host">
         <div data-block="modal-header" translate>Restart Services on Content Host "{{host.name}}"?</div>
         <div data-block="modal-body" translate>Are you sure you want to restart services on content host "{{ host.name }}"?</div>
-        <div data-block="modal-confirm-button" translate>Restart</div>
+        <span data-block="modal-confirm-button">
+          <button class="btn btn-primary" ng-click="ok()">
+            <span translate>Restart</span>
+          </button>
+        </span>
       </div>
 
-        <span bst-feature-flag="remote_actions">
-          <span class="btn-group" uib-dropdown>
-            <button class="btn btn-primary"
-                    translate
-                    ng-hide="denied('edit_hosts', host)"
-                    ng-disabled="detailsTable.getSelected().length == 0 || !remoteExecutionPresent"
-                    ng-click="openModal()">
-              Restart Selected
-            </button>
-          </span>
+      <span bst-feature-flag="remote_actions">
+        <span class="btn-group" uib-dropdown>
+          <button class="btn btn-default" type="button"
+                  translate
+                  ng-hide="denied('edit_hosts', host)"
+                  ng-disabled="table.getSelected().length == 0 || !remoteExecutionPresent"
+                  ng-click="openModal()">
+            Restart Selected
+          </button>
         </span>
+      </span>
     </span>
 
     <span data-block="no-rows-message" translate>
       There are no Traces to display.
     </span>
 
+    <span data-block="no-search-results-message" translate>
+      Your search returned zero Traces.
+    </span>
+
     <div data-block="table">
-      <table class="table table-striped table-bordered" ng-class="{'table-mask': detailsTable.working}">
+      <table bst-table="table" class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
         <thead>
           <tr bst-table-head row-select>
             <th bst-table-column="application" translate>Application</th>
@@ -63,7 +71,7 @@
           </tr>
         </thead>
         <tbody>
-          <tr bst-table-row ng-repeat="trace in detailsTable.rows | filter:detailsTable.tracesCompare" row-select="trace">
+          <tr bst-table-row ng-repeat="trace in table.rows | filter:table.tracesCompare" row-select="trace">
             <td bst-table-cell >{{ trace.application }}</td>
             <td bst-table-cell >{{ trace.app_type }}</td>
             <td bst-table-cell >{{ trace.helper }}</td>

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

@@ -1,63 +1,43 @@
 <span page-title>{{ 'Errata Details' | translate }}</span>
-<a ui-sref="content-hosts.details.errata.index">
-  <i class="fa fa-double-angle-left"></i>
-  {{ "Back To Errata List" | translate }}
-</a>
-
-<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>
+
+<h3>{{ erratum.errata_id }}</h3>
+
+<dl class="dl-horizontal dl-horizontal-left">
+  <dt translate>Type</dt>
+  <dd>{{ erratum.type }}</dd>
+
+  <dt translate>Title</dt>
+  <dd>{{ erratum.title }}</dd>
+
+  <dt translate>Issued</dt>
+  <dd>{{ erratum.issued }}</dd>
+
+  <dt translate>Updated</dt>
+  <dd>{{ erratum.updated }}</dd>
+
+  <dt translate>Reboot Suggested</dt>
+  <dd>{{ erratum.reboot_suggested }}</dd>
+
+  <dt translate>Description</dt>
+  <dd>
+    <p ng-repeat="paragraph in erratum.description.split('\n\n')">
+      {{ paragraph }}
+    </p>
+  </dd>
+
+  <dt translate>Solution</dt>
+  <dd>
+    <p ng-repeat="paragraph in erratum.solution.split('\n\n')">
+      {{ paragraph }}
+    </p>
+  </dd>
+
+  <dt translate>Packages</dt>
+  <dd>
+    <ul class="list-unstyled">
+      <li ng-repeat="package in erratum.packages">
+        {{ package }}
+      </li>
+    </ul>
+  </dd>
+</dl>

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

@@ -8,17 +8,19 @@
  * @requires translate
  * @requires HostCollection
  * @requires Host
+ * @requires CurrentOrganization
  * @requires Nutupane
  *
  * @description
  *   Provides the functionality for adding host collections to a content host.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollectionsController',
-    ['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'Nutupane',
-    function ($scope, $q, $location, translate, HostCollection, Host, Nutupane) {
-        var params, hostCollectionsPane;
+    ['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'CurrentOrganization', 'Nutupane',
+    function ($scope, $q, $location, translate, HostCollection, Host, CurrentOrganization, Nutupane) {
+        var params, nutupane;
 
         params = {
+            'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
             'sort_by': 'name',
             'sort_order': 'ASC',
@@ -27,8 +29,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
             'host_id': $scope.$stateParams.hostId
         };
 
-        hostCollectionsPane = new Nutupane(HostCollection, params);
-        $scope.hostCollectionsTable = hostCollectionsPane.table;
+        nutupane = new Nutupane(HostCollection, params);
+        $scope.controllerName = 'katello_host_collections';
+        nutupane.masterOnly = true;
+
+        $scope.table = nutupane.table;
 
         $scope.successMessages = [];
         $scope.errorMessages = [];
@@ -43,10 +48,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
 
             success = function (response) {
                 $scope.successMessages = [translate('Added %x host collections to content host "%y".')
-                    .replace('%x', $scope.hostCollectionsTable.numSelected).replace('%y', host.name)];
-                $scope.hostCollectionsTable.working = false;
-                $scope.hostCollectionsTable.selectAll(false);
-                hostCollectionsPane.refresh();
+                    .replace('%x', $scope.table.numSelected).replace('%y', host.name)];
+                $scope.table.working = false;
+                $scope.table.selectAll(false);
+                nutupane.refresh();
                 $scope.host.$get();
                 deferred.resolve(response);
             };
@@ -54,13 +59,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
             error = function (response) {
                 deferred.reject(response.data.errors);
                 $scope.errorMessages = response.data.errors.base;
-                $scope.hostCollectionsTable.working = false;
+                $scope.table.working = false;
             };
 
-            $scope.hostCollectionsTable.working = true;
+            $scope.table.working = true;
 
             hostCollections = _.map(host['host_collections'], 'id');
-            hostCollectionsToAdd = _.map($scope.hostCollectionsTable.getSelected(), 'id');
+            hostCollectionsToAdd = _.map($scope.table.getSelected(), 'id');
             data = {"host_collection_ids": _.union(hostCollections, hostCollectionsToAdd)};
 
             Host.updateHostCollections({id: host.id}, data, success, error);

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

@@ -25,40 +25,52 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
             'host_id': $scope.$stateParams.hostId
         };
 
-        $scope.contentNutupane = new Nutupane(Subscription, params);
-        $scope.detailsTable = $scope.contentNutupane.table;
-        $scope.contentNutupane.setSearchKey('subscriptionSearch');
-        $scope.contentNutupane.masterOnly = true;
+        $scope.nutupane = new Nutupane(Subscription, params);
+        $scope.controllerName = 'katello_subscriptions';
+        $scope.nutupane.setSearchKey('subscriptionSearch');
+        $scope.nutupane.masterOnly = true;
+        $scope.table = $scope.nutupane.table;
+
         $scope.isAdding = false;
         $scope.groupedSubscriptions = {};
 
-        $scope.$watch('detailsTable.rows', function (rows) {
+        $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
         });
 
         $scope.getAmountSelectorValues = SubscriptionsHelper.getAmountSelectorValues;
 
+        $scope.showMatchHost = false;
+        $scope.showMatchInstalled = false;
+        $scope.showNoOverlap = false;
+
+        $scope.toggleFilters = function () {
+            $scope.nutupane.table.params['match_host'] = $scope.showMatchHost;
+            $scope.nutupane.table.params['match_installed'] = $scope.showMatchInstalled;
+            $scope.nutupane.table.params['no_overlap'] = $scope.showNoOverlap;
+            $scope.nutupane.refresh();
+        };
+
         $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;
             HostSubscription.addSubscriptions({id: $scope.$stateParams.hostId, 'subscriptions': selected}, function () {
                 Host.get({id: $scope.$stateParams.hostId}, function (host) {
                     $scope.$parent.host = host;
-                    $scope.table.replaceRow(host);
                     $scope.successMessages.push(translate("Successfully added %s subscriptions.").replace('%s', selected.length));
                     $scope.isAdding = false;
-                    $scope.contentNutupane.refresh();
+                    $scope.nutupane.refresh();
                 });
             }, function (response) {
                 $scope.errorMessages.push(response.data.displayMessage);
                 $scope.isAdding = false;
-                $scope.contentNutupane.refresh();
+                $scope.nutupane.refresh();
             });
         };
     }]