katello 3.6.0.1.rc2 → 3.7.0.rc1

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

@@ -70,6 +70,22 @@
         <p class="help-block" translate>A composite view contains other content views.</p>
       </div>
 
+      <div bst-form-group>
+        <div class="checkbox">
+          <label for="auto_publish">
+            <input id="auto_publish"
+                   name="auto_publish"
+                   ng-model="contentView.auto_publish"
+                   type="checkbox"
+                   tabindex="5"
+                   ng-disabled="!contentView.composite"
+                   ng-checked="contentView.composite && 0"/>
+            <span translate>Auto Publish</span>
+          </label>
+        </div>
+        <p class="help-block" translate>Applicable only for composite views. Auto publish composite view when a new version of a component content view is created. Also note auto publish will only happen when the component is marked "latest".</p>
+      </div>
+
       <div bst-form-buttons
            on-cancel="transitionTo('content-views')"
            on-save="save(contentView)"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js

@@ -87,7 +87,8 @@
         };
 
         params = contentTypes[currentState].params || {'content_view_version_id': $scope.$stateParams.versionId};
-        nutupane = new Nutupane(contentTypes[currentState].type, params, 'queryPaged');
+
+        nutupane = new Nutupane(contentTypes[currentState].type, params, 'queryPaged', { 'disableAutoLoad': true });
         nutupane.masterOnly = true;
 
         $scope.nutupane = nutupane;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-errata.html

@@ -26,11 +26,11 @@
               <i class="fa fa-warning inline-icon" title="{{ 'Security' | translate }}"></i>
             </span>
 
-            <span ng-show="errata.type == 'bugfix'">
+            <span ng-show="errata.type == 'bugfix' || errata.type == 'recommended'">
               <i class="fa fa-bug inline-icon" title="{{ 'Bug Fix' | translate }}"></i>
             </span>
 
-            <span ng-show="errata.type == 'enhancement'">
+            <span ng-show="errata.type == 'enhancement' || errata.type == 'optional'">
               <i class="fa fa-plus-square inline-icon" title="{{ 'Enhancement' | translate }}"></i>
             </span>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version.html

@@ -37,14 +37,14 @@
     </li>
 
     <li ng-class="{active: isState('content-view.version.apt')}"
-        ng-show="version.deb_module_count !== 0">
+        ng-show="version.deb_count !== 0">
       <a ui-sref="content-view.version.apt({versionId: version.id})">
         <span translate>Apt Repositories</span>
       </a>
     </li>
 
     <li ng-class="{active: isState('content-view.version.deb')}"
-        ng-show="version.deb_module_count !== 0">
+        ng-show="version.deb_count !== 0">
       <a ui-sref="content-view.version.deb({versionId: version.id})">
         <span translate>Deb Packages</span>
       </a>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-details.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="tag">{{ 'Details for Docker Tag:' | translate }} {{ tag.name }}</span>
+<span page-title ng-model="tag">{{ 'Details for Container Image Tag:' | translate }} {{ tag.name }}</span>
 
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
   <header data-block="header">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-environments.html

@@ -8,7 +8,7 @@
   </div>
 
   <span data-block="no-rows-message" translate>
-    This Docker Tag is not present in any Lifecycle Environments.
+    This Container Image Tag is not present in any Lifecycle Environments.
   </span>
 
   <span data-block="no-search-results-message" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-info.html

@@ -20,7 +20,7 @@
   </div>
 
   <div data-block="right-column">
-    <h4 translate>Docker Manifest</h4>
+    <h4 translate>Container Image Manifest</h4>
     <div ng-if="tag.manifest_schema1">
       <h5 translate>Schema Version 1</h5>
       <dl class="dl-horizontal dl-horizontal-left">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.routes.js

@@ -19,7 +19,7 @@ angular.module('Bastion.docker-tags').config(['$stateProvider', function ($state
             }
         },
         ncyBreadcrumb: {
-            label: "{{ 'Docker Tags' | translate }}"
+            label: "{{ 'Container Image Tags' | translate }}"
         }
     })
     .state('docker-tag', {
@@ -29,7 +29,7 @@ angular.module('Bastion.docker-tags').config(['$stateProvider', function ($state
         controller: 'DockerTagDetailsController',
         templateUrl: 'docker-tags/details/views/docker-tag-details.html',
         ncyBreadcrumb: {
-            label: "{{ 'Docker Tags' | translate }}",
+            label: "{{ 'Container Image Tags' | translate }}",
             parent: 'docker-tags'
         }
     })

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/views/docker-tags.html

@@ -1,17 +1,17 @@
-<span page-title>{{ 'Docker Tags' | translate }}</span>
+<span page-title>{{ 'Container Image Tags' | translate }}</span>
 
 <div data-extend-template="layouts/table-with-header.html">
 
   <div data-block="header">
-    <h2 translate>Docker Tags</h2>
+    <h2 translate>Container Image Tags</h2>
   </div>
 
   <span data-block="no-rows-message" translate>
-    You currently don't have any Docker Tags.
+    You currently don't have any Container Image Tags.
   </span>
 
   <span data-block="no-search-results-message" translate>
-    Your search returned zero Docker Tags.
+    Your search returned zero Container Image Tags.
   </span>
 
   <div data-block="table">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js

@@ -52,7 +52,7 @@
             }, {
                 state: 'docker',
                 resource: 'DockerTag',
-                display: translate('Docker Tags'),
+                display: translate('Container Image Tags'),
                 repositoryType: 'docker'
             }, {
                 state: 'ostree',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment.controller.js

@@ -8,7 +8,7 @@
      * @description
      *   Enter a description!
      */
-    function EnvironmentController($scope, Environment, translate, ContentService, ApiErrorHandler, Notification) {
+    function EnvironmentController($scope, Environment, translate, ContentService, ApiErrorHandler, Notification, RepositoryTypesService) {
 
         $scope.contentTypes = ContentService.contentTypes;
         $scope.panel = {
@@ -16,6 +16,7 @@
             loading: true
         };
 
+        $scope.repositoryTypeEnabled = RepositoryTypesService.repositoryTypeEnabled;
         $scope.environment = Environment.get({id: $scope.$stateParams.environmentId}, function () {
             $scope.panel.loading = false;
         }, function (response) {
@@ -67,6 +68,6 @@
         .module('Bastion.environments')
         .controller('EnvironmentController', EnvironmentController);
 
-    EnvironmentController.$inject = ['$scope', 'Environment', 'translate', 'ContentService', 'ApiErrorHandler'];
+    EnvironmentController.$inject = ['$scope', 'Environment', 'translate', 'ContentService', 'ApiErrorHandler', 'Notification', 'RepositoryTypesService'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-details.html

@@ -1,3 +1,5 @@
+<span page-title ng-model="environment">{{ 'Lifecycle Environment:' | translate }} {{ environment.name }}</span>
+
 <div data-extend-template="layouts/two-column-details.html">
   <div data-block="left-column">
     <h4 translate>Basic Information</h4>
@@ -12,6 +14,12 @@
       <dt translate>Label</dt>
       <dd>{{ environment.label }}</dd>
 
+      <dt translate>Registry Name Pattern</dt>
+      <dd bst-edit-textarea="environment.registry_name_pattern"
+          on-save="save(environment)"
+          readonly="denied('edit_lifecycle_environments', environment)">
+      </dd>
+
       <dt translate>Description</dt>
       <dd bst-edit-textarea="environment.description"
           on-save="save(environment)"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-docker.html

@@ -5,11 +5,11 @@
   </div>
 
   <span data-block="no-rows-message" translate>
-    There are no Docker Tags that match the criteria.
+    There are no Container Image Tags that match the criteria.
   </span>
 
   <span data-block="no-search-results-message" translate>
-    Your search returned zero Docker Tags.
+    Your search returned zero Container Image Tags.
   </span>
 
   <table data-block="table" class="table table-striped table-bordered">
@@ -23,9 +23,13 @@
 
     <tbody>
       <tr bst-table-row ng-repeat="dockerTag in table.rows">
-        <td bst-table-cell>{{ dockerTag.name }}</td>
-        <td bst-table-cell>{{ dockerTag.product.name }}</td>
-        <td bst-table-cell>{{ dockerTag.repository.name }}</td>
+        <td bst-table-cell>
+          <a ng-href="/docker_tags/{{ dockerTag.id }}">{{ dockerTag.name }}</a>
+        </td>
+        <td bst-table-cell>
+          <a ng-href="/products/{{ dockerTag.product.id }}/repositories/{{ dockerTag.repository.id }}">{{ dockerTag.product.name }}</a>
+        </td>
+        <td bst-table-cell>{{ dockerTag.repository.full_path }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-errata.html

@@ -38,11 +38,11 @@
               <i class="fa fa-warning inline-icon" title="{{ 'Security' | translate }}"></i>
             </span>
 
-            <span ng-show="errata.type == 'bugfix'">
+            <span ng-show="errata.type == 'bugfix' || errata.type == 'recommended'">
               <i class="fa fa-bug inline-icon" title="{{ 'Bug Fix' | translate }}"></i>
             </span>
 
-            <span ng-show="errata.type == 'enhancement'">
+            <span ng-show="errata.type == 'enhancement' || errata.type = 'optional'">
               <i class="fa fa-plus-square inline-icon" title="{{ 'Enhancement' | translate }}"></i>
             </span>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment.html

@@ -20,7 +20,8 @@
         </a>
       </li>
 
-      <li ng-repeat="type in contentTypes" ng-class="{active: isState('environment.' + type.state)}">
+      <li ng-repeat="type in contentTypes" ng-class="{active: isState('environment.' + type.state)}"
+          ng-show="type.repositoryType == undefined || repositoryTypeEnabled(type.repositoryType)">
         <a ng-href="{{ $state.href('environment.' + type.state, {environmentId: environment.id}) }}">
           <span translate>{{ type.display }}</span>
         </a>

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

@@ -26,12 +26,24 @@
               <td class="info-block-head"><a ui-sref="environment.details({environmentId: library.id})" translate>Library</a></td>
               <td class="info-block" translate>Content Views <div>{{ library.counts.content_views || 0 }}</div></td>
               <td class="info-block" translate>Products <div>{{ library.counts.products || 0 }}</div></td>
-              <td class="info-block" translate>Yum Repositories <div>{{ library.counts.yum_repositories || 0 }}</div></td>
-              <td class="info-block" translate>OSTree Repositories <div>{{ library.counts.ostree_repositories || 0 }}</div></td>
-              <td class="info-block" translate>Docker Repositories <div>{{ library.counts.docker_repositories || 0 }}</div></td>
-              <td class="info-block" translate>Packages <div>{{ library.counts.packages || 0 }}</div></td>
-              <td class="info-block" translate>Errata <div>{{ library.counts.errata.total || 0 }}</div></td>
-              <td class="info-block" translate>Puppet Modules <div>{{ library.counts.puppet_modules || 0 }}</div></td>
+              <td class="info-block" ng-hide="library.counts.yum_repositories == 0" translate>
+                Yum Repositories <div>{{ library.counts.yum_repositories || 0 }}</div>
+              </td>
+              <td class="info-block" ng-hide="library.counts.ostree_repositories == 0" translate>
+                OSTree Repositories <div>{{ library.counts.ostree_repositories || 0 }}</div>
+              </td>
+              <td class="info-block" ng-hide="library.counts.docker_repositories == 0" translate>
+                Docker Repositories <div>{{ library.counts.docker_repositories || 0 }}</div>
+              </td>
+              <td class="info-block" ng-hide="library.counts.packages == 0" translate>
+                Packages <div>{{ library.counts.packages || 0 }}</div>
+              </td>
+              <td class="info-block" ng-hide="library.counts.errata.total == 0" translate>
+                Errata <div>{{ library.counts.errata.total || 0 }}</div>
+              </td>
+              <td class="info-block" ng-hide="library.counts.puppet_modules == 0"  translate>
+                Puppet Modules <div>{{ library.counts.puppet_modules || 0 }}</div>
+              </td>
             </tr>
           </tbody>
         </table>

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

@@ -15,7 +15,7 @@
 angular.module('Bastion.errata').controller('ErratumContentHostsController',
     ['$scope', 'Nutupane', 'Host', 'IncrementalUpdate', 'Environment', 'CurrentOrganization',
     function ($scope, Nutupane, Host, IncrementalUpdate, Environment, CurrentOrganization) {
-        var nutupane, params, nutupaneParams = {
+        var nutupane, params, searchString, nutupaneParams = {
             'overrideAutoLoad': true
         };
 
@@ -27,9 +27,8 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
         };
 
         nutupane = new Nutupane(Host, params, 'postIndex', nutupaneParams);
-        $scope.controllerName = 'hosts';
-        nutupane.masterOnly = true;
         nutupane.enableSelectAllResults();
+        $scope.controllerName = 'hosts';
 
         $scope.nutupane = nutupane;
         $scope.table = nutupane.table;
@@ -43,9 +42,12 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             }
 
             if (term === "" || angular.isUndefined(term)) {
-                return addition;
+                searchString = addition;
+            } else {
+                searchString = term + ' and ' + addition;
             }
-            return term + ' and ' + addition;
+
+            return searchString;
         };
 
         Environment.queryUnpaged(function (response) {
@@ -58,7 +60,7 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
 
         $scope.errataSearchString = function(installable) {
             var searchTerm = installable ? 'installable_errata' : 'applicable_errata',
-                searchStatements, errataIds;
+                searchStatements, errataIds, hostSearchString;
 
             if ($scope.errata) {
                 errataIds = [$scope.errata['errata_id']];
@@ -69,7 +71,10 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             searchStatements = _.map(errataIds, function(errataId) {
                 return searchTerm + ' = "' + errataId + '"';
             });
-            return searchStatements.join(" or ");
+
+            hostSearchString = searchStatements.join(" or ");
+
+            return hostSearchString;
         };
         nutupane.load();
 
@@ -79,7 +84,8 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
         };
 
         $scope.goToNextStep = function () {
-            IncrementalUpdate.setBulkContentHosts(nutupane.getAllSelectedResults());
+            var bulkContentHosts = nutupane.getAllSelectedResults();
+
             if ($scope.errata) {
                 IncrementalUpdate.setErrataIds([$scope.errata['errata_id']]);
             }
@@ -89,6 +95,14 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             } else {
                 $scope.transitionTo('apply-errata.confirm');
             }
+
+            if ($scope.table.allResultsSelected) {
+                bulkContentHosts.included.search = searchString;
+            } else {
+                bulkContentHosts.included.search = null;
+            }
+
+            IncrementalUpdate.setBulkContentHosts(bulkContentHosts);
         };
 
         $scope.incrementalUpdates = IncrementalUpdate.getIncrementalUpdates();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/erratum-repositories.controller.js

@@ -35,6 +35,9 @@ function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrg
 
     contentView = ContentView.queryUnpaged(function (response) {
         $scope.contentViews = response.results;
+        _.each($scope.contentViews, function(cv) {
+            cv['environment_ids'] = _.map(cv.environments, 'id');
+        });
         $scope.contentViewFilter = _.find($scope.contentViews, {'default': true});
     });
 
@@ -45,11 +48,24 @@ function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrg
     });
 
     $scope.filterErrata = function () {
+        var foundVersion, env;
         params['environment_id'] = $scope.environmentFilter;
-        params['content_view_version_id'] = $scope.contentViewFilter;
 
         if ($scope.contentViewFilter) {
-            params['content_view_version_id'] = _.map($scope.contentViewFilter.versions, 'id');
+            foundVersion = _.find($scope.contentViewFilter.versions, function(version) {
+                // Find the version belonging to the environment specified by the enviroment filter
+                env = _.find(version.environment_ids, function(envId) {
+                    return envId === $scope.environmentFilter;
+                });
+
+                return !angular.isUndefined(env);
+            });
+
+            if (!angular.isUndefined(foundVersion)) {
+                params['content_view_version_id'] = foundVersion.id;
+            } else {
+                delete params['content_view_version_id'];
+            }
         }
 
         repositoriesNutupane.setParams = (params);

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

@@ -46,7 +46,9 @@
       <span translate>The Content View or Lifecycle Environment needs to be updated in order to make errata available to these hosts.</span>
     </p>
 
-    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+    <div data-extend-template="layouts/select-all-results.html"></div>
+
+    <table class="table table-striped table-bordered">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="name"><span translate>Name</span></th>
@@ -70,7 +72,5 @@
         </tr>
       </tbody>
     </table>
-
-    <div data-block="footer-actions" class="footer-actions"></div>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-repositories.html

@@ -14,7 +14,7 @@
     <select class="form-control"
             ng-disabled="!contentViews || filteredCVs.length === 0"
             ng-model="contentViewFilter"
-            ng-options="cv as cv.name for cv in filteredCVs = (contentViews | filter:{environments: environmentFilter})"
+            ng-options="cv as cv.name for cv in filteredCVs = (contentViews | filter:{environment_ids: environmentFilter})"
             ng-change="filterErrata()">
     </select>
     <p class="help-block" translate ng-show="filteredCVs.length === 0">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/incremental-update.service.js

@@ -8,7 +8,7 @@
      *   Provides a helper service for Incremental Updates.
      *
      */
-    function IncrementalUpdate($q, Task, CurrentOrganization) {
+    function IncrementalUpdate($q, $httpParamSerializer, Task, CurrentOrganization) {
         var getIdsFromBulk;
 
         getIdsFromBulk = function (bulkResource) {
@@ -66,6 +66,7 @@
          * Allows setting the Bulk Content Hosts.
          *
          * @param {Object} bulkContentHosts the bulk selection of the content hosts.
+         * @param {Array} errataIds the errata IDs to add to the bulk search
          *
          * @returns {Boolean}
          */
@@ -133,6 +134,6 @@
 
     angular.module('Bastion.errata').service('IncrementalUpdate', IncrementalUpdate);
 
-    IncrementalUpdate.$inject = ['$q', 'Task', 'CurrentOrganization'];
+    IncrementalUpdate.$inject = ['$q', '$httpParamSerializer', 'Task', 'CurrentOrganization'];
 
 })();

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

@@ -16,12 +16,23 @@
   <h3 ng-show="errata" translate>Apply {{ errata.errata_id }}</h3>
 
   <section ng-hide="updates.length > 0">
-    <p translate ng-show="errata">
-      Apply {{ errata.errata_id }} to {{ contentHostIds.length  }} Content Host(s)?
-    </p>
-    <p translate ng-hide="errata">
-      Apply {{ errataIds.length }} Errata to {{ contentHostIds.length }} Content Host(s)?
-    </p>
+    <div ng-show="errata">
+      <p translate ng-show="contentHostIds.length === 0">
+        Apply {{ errata.errata_id }} to all Content Host(s)?
+      </p>
+      <p translate ng-hide="contentHostIds.length === 0">
+        Apply {{ errata.errata_id }} to {{ contentHostIds.length  }} Content Host(s)?
+      </p>
+    </div>
+
+    <div ng-hide="errata">
+      <p translate ng-show="contentHostIds.length === 0">
+        Apply {{ errataIds.length }} Errata to all Content Host(s)?
+      </p>
+      <p translate ng-hide="contentHostIds.length === 0">
+        Apply {{ errataIds.length }} Errata to {{ contentHostIds.length }} Content Host(s)?
+      </p>
+    </div>
   </section>
 
   <section ng-show="updates.length > 0">