katello 2.2.2 → 2.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/erratum.factory.js

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- **/
-
 /**
  * @ngdoc service
  * @name  Bastion.errata.factory:Erratum

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

@@ -17,21 +17,25 @@
   <p class="alert alert-warning" translate>You must select at least one Content Host in order to apply Errata.</p>
 </section>
 
-<section class="details details-full" ng-show="selectedContentHosts">
+<section class="col-md-4" ng-hide="errataIds">
+  <p class="alert alert-warning" translate>You must select at least one Errata to apply.</p>
+</section>
+
+<section class="details details-full" ng-show="selectedContentHosts && errataIds">
   <h3 ng-show="errata" translate>Apply {{ errata.errata_id }}</h3>
 
   <section ng-hide="updates">
     <p translate ng-show="errata">
-      Apply {{ errata.errata_id }} to {{ selectedContentHosts.included.ids.length }} Content Host(s)?
+      Apply {{ errata.errata_id }} to {{ numberOfContentHostsToUpdate }} Content Host(s)?
     </p>
     <p translate ng-hide="errata">
-      Apply {{ errataIds.length }} Errata to {{ selectedContentHosts.included.ids.length }} Content Host(s)?
+      Apply {{ errataIds.length }} Errata to {{ numberOfContentHostsToUpdate }} Content Host(s)?
     </p>
   </section>
 
   <section ng-show="updates">
     <p translate>
-      These Errata are not Installable via your published Content View versions running on the selected hosts.  The new Content View Versions (specified below)
+      One or more of the selected Errata are not Installable via your published Content View versions running on the selected hosts.  The new Content View Versions (specified below)
       will be created which will make this Errata Installable in the host's Environment.  This new version will replace the current version in your host's Lifecycle
       Environment.  To install these errata immediately on hosts after publishing check the box below.
     </p>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata.html

@@ -34,14 +34,25 @@
 
     <div class="col-sm-3">
       <label class="checkbox-inline" title="{{ 'Only show Errata that is Applicable to one or more Content Hosts' | translate }}">
-        <input type="checkbox" ng-model="showApplicable" ng-change="toggleApplicable()"/>
+        <input type="checkbox" ng-model="showApplicable" ng-disabled="showInstallable" ng-change="toggleFilters()"/>
         <span translate>Applicable</span>
+        <i class="fa fa-question-circle" ng-show="showInstallable" title="{{ 'Errata is automatically Applicable if it is Installable' | translate }}"></i>
       </label>
 
       <label class="checkbox-inline" title="{{ 'Only show Errata that is Installable on one or more Content Hosts' | translate }}">
-        <input type="checkbox" ng-model="showInstallable" ng-change="toggleInstallable()"/>
+        <input type="checkbox" ng-model="showInstallable" ng-change="toggleFilters()"/>
         <span translate>Installable</span>
       </label>
     </div>
   </div>
+
+  <span data-block="no-rows-message">
+    <span ng-hide="errataCount > 0" translate>
+      There are no Errata in this organization.  Create one or more Products with Errata to view Errata on this page.
+    </span>
+    <span ng-show="errataCount > 0" translate>
+      There are {{ errataCount }} total Errata in this organization but none match the above filters.
+    </span>
+  </span>
+
 </div>

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

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 /**
  * @ngdoc object
  * @name  Bastion.gpgKeys.controller:GPGKeyDetailsInfoController

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

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 /**
  * @ngdoc object
  * @name  Bastion.gpg-keys.controller:GPGKeyDetailsController

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-key.factory.js

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- **/
-
 /**
  * @ngdoc service
  * @name  Katello.gpg-keys.factory:GPGKey

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-keys.controller.js

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 /**
  * @ngdoc object
  * @name  Bastion.gpg-keys.controller:GPGKeysController
@@ -30,11 +17,11 @@ angular.module('Bastion.gpg-keys').controller('GPGKeysController',
     ['$scope', '$location', 'Nutupane', 'GPGKey', 'CurrentOrganization',
     function ($scope, $location, Nutupane, GPGKey, CurrentOrganization) {
         var params = {
-            'organization_id':  CurrentOrganization,
-            'search':           $location.search().search || "",
-            'sort_by':          'name',
-            'sort_order':       'ASC',
-            'paged':            true
+            'organization_id': CurrentOrganization,
+            'search': $location.search().search || "",
+            'sort_by': 'name',
+            'sort_order': 'ASC',
+            'paged': true
         };
 
         var nutupane = new Nutupane(GPGKey, params);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-keys.module.js

@@ -1,16 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- **/
-
 /**
  * @ngdoc module
  * @name  Bastion.gpg-keys

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/new/new-gpg-key.controller.js

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 /**
  * @ngdoc object
  * @name  Bastion.gpg-keys.controller:NewGPGKeyController
@@ -35,7 +22,7 @@ angular.module('Bastion.gpg-keys').controller('NewGPGKeyController',
 
         $scope.uploadContent = function (content) {
             if (content) {
-                if (content.errors === undefined) {
+                if (angular.isUndefined(content.errors)) {
                     $scope.table.addRow(content);
                     $scope.uploadStatus = 'success';
                     $scope.transitionTo('gpgKeys.index');

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

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 /**
  * @ngdoc object
  * @name  Bastion.host-collections.controller:HostCollectionAddContentHostsController
@@ -32,26 +19,26 @@ angular.module('Bastion.host-collections').controller('HostCollectionAddContentH
         var addContentHostsPane, params;
 
         params = {
-            'organization_id':          CurrentOrganization,
-            'search':                   $location.search().search || "",
-            'page':                     1,
-            'sort_by':                  'name',
-            'sort_order':               'ASC',
-            'paged':                    true
+            'organization_id': CurrentOrganization,
+            'search': $location.search().search || "",
+            'page': 1,
+            'sort_by': 'name',
+            'sort_order': 'ASC',
+            'paged': true
         };
 
         addContentHostsPane = new Nutupane(ContentHost, params);
         addContentHostsPane.searchTransform = function (term) {
             var addition = "NOT ( host_collection_ids:" + $scope.$stateParams.hostCollectionId + " )";
-            if (term === "" || term === undefined) {
+            if (term === "" || angular.isUndefined(term)) {
                 return addition;
-            } else {
-                return term +  " " + addition;
             }
+
+            return term + " " + addition;
         };
 
         $scope.addContentHostsTable = addContentHostsPane.table;
-        $scope.isAdding  = false;
+        $scope.isAdding = false;
         $scope.addContentHostsTable.closeItem = function () {};
 
         $scope.disableAddButton = function () {
@@ -77,7 +64,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionAddContentH
                 $scope.refreshHostCollection();
             }, function (response) {
                 $scope.$parent.errorMessages.push(response.data.displayMessage);
-                $scope.isAdding  = false;
+                $scope.isAdding = false;
             });
         };
 

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

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 /**
  * @ngdoc object
  * @name  Bastion.host-collections.controller:HostCollectionContentHostsController
@@ -30,11 +17,11 @@ angular.module('Bastion.host-collections').controller('HostCollectionContentHost
         var contentHostsPane, params;
 
         params = {
-            'id':          $scope.$stateParams.hostCollectionId,
-            'search':      $location.search().search || "",
-            'sort_by':     'name',
-            'sort_order':  'ASC',
-            'paged':       true
+            'id': $scope.$stateParams.hostCollectionId,
+            'search': $location.search().search || "",
+            'sort_by': 'name',
+            'sort_order': 'ASC',
+            'paged': true
         };
 
         contentHostsPane = new Nutupane(HostCollection, params, 'contentHosts');

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 /**
  * @ngdoc object
  * @name  Bastion.host-collections.controller:HostCollectionDetailsController
@@ -66,7 +53,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
             HostCollection.copy({id: $scope.hostCollection.id, 'host_collection': {name: newName}}, function (response) {
                 $scope.showCopy = false;
                 $scope.table.addRow(response);
-                $scope.transitionTo('host-collections.details.info', {hostCollectionId: response['id']});
+                $scope.transitionTo('host-collections.details.info', {hostCollectionId: response.id});
             }, function (response) {
                 $scope.copyErrorMessages.push(response.data.displayMessage);
             });

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

@@ -39,48 +39,50 @@
   </div>
 
   <div bst-table="addContentHostsTable" class="nutupane">
-    <div bst-container-scroll bst-infinite-scroll="addContentHostsTable.nextPage()" data="addContentHostsTable.rows">
+    <div bst-container-scroll data="addContentHostsTable.rows">
+      <div infinite-scroll="addContentHostsTable.nextPage()" infinite-scroll-container="'.nutupane-sub-section .container-scroll-wrapper'">
 
-      <div class="loading-mask" ng-show="addContentHostsTable.working && addContentHostsTable.rows.length == 0">
-        <i class="fa fa-spinner fa-spin"></i>
-        {{ "Loading..." | translate }}
-      </div>
+        <div class="loading-mask" ng-show="addContentHostsTable.working && addContentHostsTable.rows.length == 0">
+          <i class="fa fa-spinner fa-spin"></i>
+          {{ "Loading..." | translate }}
+        </div>
 
-      <p bst-alert="info" ng-show="addContentHostsTable.rows.length === 0 && !addContentHostsTable.working">
-        <span translate>
-          You currently don't have any Content Hosts, you can create new Content Hosts by selecting Contents Host from main menu and then clicking the button on the right.
-        </span>
-      </p>
+        <p bst-alert="info" ng-show="addContentHostsTable.rows.length === 0 && !addContentHostsTable.working">
+          <span translate>
+            You currently don't have any Content Hosts, you can create new Content Hosts by selecting Contents Host from main menu and then clicking the button on the right.
+          </span>
+        </p>
 
-      <table ng-class="{'table-mask': addContentHostsTable.working}"
-             class="table table-full table-striped"
-             ng-show="addContentHostsTable.rows.length > 0">
-        <thead>
-          <tr bst-table-head row-select>
-            <th bst-table-column="name" translate>Name</th>
-            <th bst-table-column="name" translate>Environment</th>
-            <th bst-table-column="name" translate>Content View</th>
-          </tr>
-        </thead>
+        <table ng-class="{'table-mask': addContentHostsTable.working}"
+               class="table table-full table-striped"
+               ng-show="addContentHostsTable.rows.length > 0">
+          <thead>
+            <tr bst-table-head row-select>
+              <th bst-table-column="name" translate>Name</th>
+              <th bst-table-column="name" translate>Environment</th>
+              <th bst-table-column="name" translate>Content View</th>
+            </tr>
+          </thead>
 
-        <tbody>
-          <tr bst-table-row ng-repeat="contentHost in addContentHostsTable.rows">
-            <td class="row-select">
-              <input type="checkbox"
-                     ng-model="contentHost.selected"
-                     ng-change="itemSelected(contentHost)"/>
-            </td>
-            <td bst-table-cell>
-              <a ui-sref="content-hosts.details.info({contentHostId: contentHost.uuid})">
-                {{ contentHost.name }}
-              </a>
-            </td>
-            <td bst-table-cell>{{ contentHost.environment.name }}</td>
-            <td bst-table-cell>{{ contentHost.content_view.name }}</td>
-          </tr>
+          <tbody>
+            <tr bst-table-row ng-repeat="contentHost in addContentHostsTable.rows">
+              <td class="row-select">
+                <input type="checkbox"
+                       ng-model="contentHost.selected"
+                       ng-change="itemSelected(contentHost)"/>
+              </td>
+              <td bst-table-cell>
+                <a ui-sref="content-hosts.details.info({contentHostId: contentHost.uuid})">
+                  {{ contentHost.name }}
+                </a>
+              </td>
+              <td bst-table-cell>{{ contentHost.environment.name }}</td>
+              <td bst-table-cell>{{ contentHost.content_view.name }}</td>
+            </tr>
 
-        </tbody>
-      </table>
+          </tbody>
+        </table>
+      </div>
     </div>
   </div>
 </section>

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

@@ -38,43 +38,45 @@
   </div>
 
   <div bst-table="contentHostsTable" class="nutupane">
-    <div bst-container-scroll bst-infinite-scroll="contentHostsTable.nextPage()" data="contentHostsTable.rows">
+    <div bst-container-scroll data="contentHostsTable.rows">
+      <div infinite-scroll="contentHostsTable.nextPage()" infinite-scroll-container="'.nutupane-sub-section .container-scroll-wrapper'">
 
-      <div class="loading-mask" ng-show="contentHostsTable.working && contentHostsTable.rows.length == 0">
-        <i class="fa fa-spinner fa-spin"></i>
-        {{ "Loading..." | translate }}
-      </div>
+        <div class="loading-mask" ng-show="contentHostsTable.working && contentHostsTable.rows.length == 0">
+          <i class="fa fa-spinner fa-spin"></i>
+          {{ "Loading..." | translate }}
+        </div>
 
-      <p bst-alert="info" ng-show="contentHostsTable.rows.length === 0 && !contentHostsTable.working">
-        <span translate>
-          You currently don't have any Content Hosts in this Host Group, you can add Content Hosts after selecting the 'Add' tab.
-        </span>
-      </p>
+        <p bst-alert="info" ng-show="contentHostsTable.rows.length === 0 && !contentHostsTable.working">
+          <span translate>
+            You currently don't have any Content Hosts in this Host Group, you can add Content Hosts after selecting the 'Add' tab.
+          </span>
+        </p>
 
-      <table ng-class="{'table-mask': contentHostsTable.working}" 
-             class="table table-full table-striped"
-             ng-show="contentHostsTable.rows.length > 0">
-        <thead>
-          <tr bst-table-head row-select>
-            <th bst-table-column="name" translate>Name</th>
-            <th bst-table-column="environment" translate>Environment</th>
-            <th bst-table-column="content_view" translate>Content View</th>
-          </tr>
-        </thead>
+        <table ng-class="{'table-mask': contentHostsTable.working}"
+               class="table table-full table-striped"
+               ng-show="contentHostsTable.rows.length > 0">
+          <thead>
+            <tr bst-table-head row-select>
+              <th bst-table-column="name" translate>Name</th>
+              <th bst-table-column="environment" translate>Environment</th>
+              <th bst-table-column="content_view" translate>Content View</th>
+            </tr>
+          </thead>
 
-        <tbody>
-          <tr bst-table-row ng-repeat="contentHost in contentHostsTable.rows" row-select="contentHost">
-            <td bst-table-cell >
-              <a ui-sref="content-hosts.details.info({contentHostId: contentHost.uuid})">
-                {{ contentHost.name}}
-              </a>
-            </td>
-            <td bst-table-cell >{{ contentHost.environment.name}}</td>
-            <td bst-table-cell >{{ contentHost.content_view.name}}</td>
-          </tr>
+          <tbody>
+            <tr bst-table-row ng-repeat="contentHost in contentHostsTable.rows" row-select="contentHost">
+              <td bst-table-cell >
+                <a ui-sref="content-hosts.details.info({contentHostId: contentHost.uuid})">
+                  {{ contentHost.name}}
+                </a>
+              </td>
+              <td bst-table-cell >{{ contentHost.environment.name}}</td>
+              <td bst-table-cell >{{ contentHost.content_view.name}}</td>
+            </tr>
 
-        </tbody>
-      </table>
+          </tbody>
+        </table>
+      </div>
     </div>
   </div>
 </section>