katello 4.10.0 → 4.11.0.rc2

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

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.display_name }}</span>
 
 <div ng-hide="host.hasSubscription()">
   <div data-extend-template="common/views/registration.html"></div>
@@ -65,7 +65,7 @@
 
         <dt ng-show="host.subscription_facet_attributes.virtual_host" translate>Virtual Host</dt>
         <dd ng-show="host.subscription_facet_attributes.virtual_host">
-          <a ui-sref="content-host.info({hostId: host.subscription_facet_attributes.virtual_host.id })">{{ host.subscription_facet_attributes.virtual_host.name }}</a>
+          <a ui-sref="content-host.info({hostId: host.subscription_facet_attributes.virtual_host.id })">{{ host.subscription_facet_attributes.virtual_host.display_name }}</a>
         </dd>
       </dl>
 
@@ -345,7 +345,7 @@
 
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate>Hostname</dt>
-        <dd>{{ host.name }}</dd>
+        <dd>{{ host.display_name }}</dd>
 
         <dt translate>IPv4 Address</dt>
         <dd>{{ host.facts["network::ipv4_address"] }}</dd>

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

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.display_name }}</span>
 
 <div data-extend-template="layouts/two-column-details.html">
   <div data-block="left-column">
@@ -8,7 +8,7 @@
       <dt translate>Name</dt>
       <dd>
         <a href="/hosts/{{ host.name }}">
-          {{ host.name }}
+          {{ host.display_name }}
         </a>
       </dd>
 

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

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Subscriptions for Content Host:' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Subscriptions for Content Host:' | translate }} {{ host.display_name }}</span>
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">

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

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Subscriptions for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Subscriptions for: ' | translate }} {{ host.display_name }}</span>
 
 <div ng-hide="host.hasSubscription()">
   <div data-extend-template="common/views/registration.html"></div>

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

@@ -100,9 +100,9 @@
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
             <span ng-switch="newHostDetailsUI">
-              <a ng-switch-when="true" ng-if="host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}/content">{{ host.name }}</a>
-              <a ng-switch-when="true" ng-if="!host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}">{{ host.name}}</a>
-              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
+              <a ng-switch-when="true" ng-if="host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}/content">{{ host.display_name }}</a>
+              <a ng-switch-when="true" ng-if="!host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}">{{ host.display_name }}</a>
+              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.display_name }}</a>
             </span>
           </td>
           <td bst-table-cell ng-hide="simpleContentAccessEnabled">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js

@@ -8,6 +8,9 @@
      * @description
      *   Handles fetching deb packages and populating Nutupane based on the current
      *   ui-router state.
+     *
+     * @requires translate
+     *
      */
     function DebsController($scope, $location, translate, Nutupane, Deb, CurrentOrganization) {
         var nutupane;
@@ -24,6 +27,10 @@
         nutupane.primaryOnly = true;
 
         $scope.table = nutupane.table;
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Debs');
+
         $scope.controllerName = 'katello_debs';
 
         Deb.queryPaged({'organization_id': CurrentOrganization}, function (result) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/deb-content-views.controller.js

@@ -6,8 +6,11 @@
      *
      * @description
      *   Provides the functionality for the debs details contentViews page.
+     *
+     * @requires translate
+     *
      */
-    function DebContentViewsController($scope, Nutupane, ContentViewVersion, CurrentOrganization) {
+    function DebContentViewsController($scope, Nutupane, ContentViewVersion, CurrentOrganization, translate) {
         var contentViewsNutupane,
             params = {
                 'deb_id': $scope.$stateParams.debId,
@@ -16,6 +19,10 @@
 
         contentViewsNutupane = new Nutupane(ContentViewVersion, params);
         $scope.controllerName = 'katello_content_views';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Content Views');
+
         contentViewsNutupane.primaryOnly = true;
         contentViewsNutupane.setSearchKey('contentViewsSearch');
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/deb-repositories.controller.js

@@ -6,8 +6,11 @@
      *
      * @description
      *   Provides the functionality for the debs details repositories page.
+     *
+     * @requires translate
+     *
      */
-    function DebRepositoriesController($scope, Nutupane, Repository, CurrentOrganization) {
+    function DebRepositoriesController($scope, Nutupane, Repository, CurrentOrganization, translate) {
         var repositoriesNutupane,
             params = {
                 'deb_id': $scope.$stateParams.debId,
@@ -16,6 +19,10 @@
 
         repositoriesNutupane = new Nutupane(Repository, params);
         $scope.controllerName = 'katello_repositories';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Repositories');
+
         repositoriesNutupane.primaryOnly = true;
         repositoriesNutupane.setSearchKey('repositoriesSearch');
 
@@ -30,7 +37,8 @@
         '$scope',
         'Nutupane',
         'Repository',
-        'CurrentOrganization'
+        'CurrentOrganization',
+        'translate'
     ];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-environments.controller.js

@@ -6,13 +6,14 @@
  * @requires $location
  * @requires DockerTag
  * @requires CurrentOrganization
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the docker tags details environments list.
  */
 angular.module('Bastion.docker-tags').controller('DockerTagEnvironmentsController',
-    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization',
-    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization) {
+    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization', 'translate',
+    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization, translate) {
         var params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -31,6 +32,8 @@ angular.module('Bastion.docker-tags').controller('DockerTagEnvironmentsControlle
             nutupane.refresh();
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Lifecycle Environments');
         $scope.table = nutupane.table;
 
         $scope.controllerName = 'katello_docker_tags';

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-repositories.controller.js

@@ -6,13 +6,14 @@
  * @requires $location
  * @requires DockerTag
  * @requires CurrentOrganization
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the docker tags details repositories list.
  */
 angular.module('Bastion.docker-tags').controller('DockerTagRepositoriesController',
-    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization',
-    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization) {
+    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization', 'translate',
+    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization, translate) {
         var params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -31,6 +32,9 @@ angular.module('Bastion.docker-tags').controller('DockerTagRepositoriesControlle
             nutupane.refresh();
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Repositories');
+
         $scope.table = nutupane.table;
 
         $scope.controllerName = 'katello_docker_tags';

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

@@ -7,6 +7,7 @@
  * @requires Nutupane
  * @requires DockerTag
  * @requires CurrentOrganization
+ * @requires translate
  *
  * @description
  *   Provides the functionality specific to docker tags for use with the Nutupane UI pattern.
@@ -14,8 +15,8 @@
  *   within the table.
  */
 angular.module('Bastion.docker-tags').controller('DockerTagsController',
-    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization',
-    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization) {
+    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization', 'translate',
+    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization, translate) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -27,7 +28,9 @@ angular.module('Bastion.docker-tags').controller('DockerTagsController',
         var nutupane = new Nutupane(DockerTag, params);
         $scope.controllerName = 'katello_docker_tags';
         $scope.table = nutupane.table;
-        $scope.controllerName = 'katello_docker_tags';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Container Image Tags');
 
         $scope.table.closeItem = function () {
             $scope.transitionTo('docker-tags');

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

@@ -7,12 +7,25 @@
      *
      * @description
      *   Controls displaying content tables for a given environment along with appropriate filtering.
+     *
+     * @requires translate
+     *
      */
     function EnvironmentContentController($scope, ContentService, ContentView, Repository, translate, $location) {
         var nutupane, allRepositories, nutupaneParams;
 
         $scope.controllerName = 'katello_environments';
 
+        // Labels so breadcrumb strings can be translated
+        $scope.errataLabel = translate('Errata');
+        $scope.repositoriesLabel = translate('Repositories');
+        $scope.packagesLabel = translate('Packages');
+        $scope.debReposLabel = translate('Deb Repositories');
+        $scope.debsLabel = translate('Deb Packages');
+        $scope.moduleStreamsLabel = translate('Module Streams');
+        $scope.dockerLabel = translate('Docker');
+        $scope.contentViewsLabel = translate('Content Views');
+
         function fetchContentViews(environmentId) {
             ContentView.queryUnpaged({'environment_id': environmentId}, function (data) {
                 $scope.contentViews = [$scope.contentView].concat(data.results);

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

@@ -7,6 +7,9 @@
      *
      * @description
      *   Enter a description!
+     *
+     * @requires translate
+     *
      */
     function EnvironmentController($scope, Environment, translate, ContentService, ApiErrorHandler, Notification, RepositoryTypesService) {
 
@@ -18,6 +21,9 @@
 
         $scope.controllerName = 'katello_environments';
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Environments');
+
         $scope.repositoryTypeEnabled = RepositoryTypesService.repositoryTypeEnabled;
         $scope.environment = Environment.get({id: $scope.$stateParams.environmentId}, function () {
             $scope.panel.loading = false;

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

@@ -7,8 +7,11 @@
      *
      * @description
      *   Handles creating a new environment.
+     *
+     * @requires translate
+     *
      */
-    function NewEnvironmentController($scope, Environment, FormUtils, Notification, PathsService) {
+    function NewEnvironmentController($scope, Environment, FormUtils, Notification, PathsService, translate) {
 
         function success() {
             $scope.transitionTo('environments');
@@ -26,6 +29,9 @@
             });
         }
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('New Environment');
+
         $scope.loading = true;
         $scope.environment = new Environment();
         $scope.priorEnvironment = Environment.get({id: $scope.$stateParams.priorId});
@@ -65,6 +71,6 @@
         .module('Bastion.environments')
         .controller('NewEnvironmentController', NewEnvironmentController);
 
-    NewEnvironmentController.$inject = ['$scope', 'Environment', 'FormUtils', 'Notification', 'PathsService'];
+    NewEnvironmentController.$inject = ['$scope', 'Environment', 'FormUtils', 'Notification', 'PathsService', 'translate'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -42,6 +42,10 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
 
             $scope.applyingErrata = false;
 
+            // Labels so breadcrumb strings can be translated
+            $scope.label = translate('Apply');
+            $scope.confirmLabel = translate('Confirm');
+
             $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
             $scope.errataActionFormValues = {
                 authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),

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

@@ -9,19 +9,24 @@
  * @requires Environment
  * @requires CurrentOrganization
  * @requires newHostDetailsUI
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the available host collection details action pane.
  */
 angular.module('Bastion.errata').controller('ErratumContentHostsController',
-    ['$scope', 'Nutupane', 'Host', 'IncrementalUpdate', 'Environment', 'CurrentOrganization', 'newHostDetailsUI',
-    function ($scope, Nutupane, Host, IncrementalUpdate, Environment, CurrentOrganization, newHostDetailsUI) {
+    ['$scope', 'Nutupane', 'Host', 'IncrementalUpdate', 'Environment', 'CurrentOrganization', 'newHostDetailsUI', 'translate',
+    function ($scope, Nutupane, Host, IncrementalUpdate, Environment, CurrentOrganization, newHostDetailsUI, translate) {
         var nutupane, params, searchString, nutupaneParams = {
             'overrideAutoLoad': true
         };
 
         $scope.restrictInstallable = false;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Content Hosts');
+        $scope.selectLabel = translate('Select Content Host(s)');
+
         params = {
             'erratum_id': $scope.$stateParams.errataId,
             'organization_id': CurrentOrganization

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

@@ -10,13 +10,14 @@
  * @requires ContentView
  * @requires CurrentOrganization
  * @requires RepositoriesFilters
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the errata details repositories page.
  */
 angular.module('Bastion.errata').controller('ErratumRepositoriesController',
-['$scope', '$q', 'Nutupane', 'Repository', 'Environment', 'ContentView', 'CurrentOrganization', 'RepositoriesFilters',
-function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrganization, RepositoriesFilters) {
+['$scope', '$q', 'Nutupane', 'Repository', 'Environment', 'ContentView', 'CurrentOrganization', 'RepositoriesFilters', 'translate',
+function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrganization, RepositoriesFilters, translate) {
     var repositoriesNutupane, environment, contentView, params = {
         'erratum_id': $scope.$stateParams.errataId,
         'organization_id': CurrentOrganization
@@ -24,6 +25,10 @@ function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrg
 
     repositoriesNutupane = new Nutupane(Repository, params);
     $scope.controllerName = 'katello_repositories';
+
+    // Labels so breadcrumb strings can be translated
+    $scope.label = translate('Repositories');
+
     $scope.table = repositoriesNutupane.table;
     $scope.table.initialLoad = false;
     repositoriesNutupane.primaryOnly = true;

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

@@ -5,12 +5,13 @@
  * @requires $scope
  * @requires Errata
  * @requires ApiErrorHandler
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the errata pages.
  */
-angular.module('Bastion.errata').controller('ErratumController', ['$scope', 'Erratum', 'ApiErrorHandler',
-    function ($scope, Erratum, ApiErrorHandler) {
+angular.module('Bastion.errata').controller('ErratumController', ['$scope', 'Erratum', 'ApiErrorHandler', 'translate',
+    function ($scope, Erratum, ApiErrorHandler, translate) {
         $scope.panel = {
             error: false,
             loading: true
@@ -18,6 +19,9 @@ angular.module('Bastion.errata').controller('ErratumController', ['$scope', 'Err
 
         $scope.moduleStreamShowMap = {};
 
+        // Labels so breadcrumb strings can be translated
+        $scope.packagesLabel = translate('Packages');
+
         if ($scope.errata) {
             $scope.panel.loading = false;
         }

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

@@ -24,10 +24,10 @@
       <dd>{{ errata.severity | errataSeverity }}</dd>
 
       <dt translate>Issued</dt>
-      <dd><long-date-time date="errata.issued" /></dd>
+      <dd>{{ errata.issued }}</dd>
 
       <dt translate>Last Updated On</dt>
-      <dd><long-date-time date="errata.updated" /></dd>
+      <dd>{{ errata.updated }}</dd>
 
       <dt translate>Reboot Suggested?</dt>
       <dd>{{ errata.reboot_suggested | booleanToYesNo }}</dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/errata.controller.js

@@ -36,6 +36,11 @@ angular.module('Bastion.errata').controller('ErrataController',
 
         nutupane = $scope.nutupane = new Nutupane(Erratum, params);
         $scope.controllerName = 'katello_errata';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Errata');
+        $scope.tasksLabel = translate('Tasks');
+
         $scope.table = nutupane.table;
         $scope.removeRow = nutupane.removeRow;
 

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

@@ -101,7 +101,7 @@
             <span translate>{{ errata.hosts_applicable_count || 0 }} Applicable, </span>
             <span translate>{{ errata.hosts_available_count || 0 }} Installable</span>
           </td>
-          <td bst-table-cell><long-date-time date="errata.updated" /></td>
+          <td bst-table-cell>{{ errata.updated }}</td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file-content-views.controller.js

@@ -6,8 +6,11 @@
      *
      * @description
      *   Provides the functionality for the files details contentViews page.
+     *
+     *  @requires translate
+     *
      */
-    function FileContentViewsController($scope, Nutupane, ContentViewVersion, CurrentOrganization) {
+    function FileContentViewsController($scope, Nutupane, ContentViewVersion, CurrentOrganization, translate) {
         var contentViewsNutupane,
             params = {
                 'file_id': $scope.$stateParams.fileId,
@@ -17,6 +20,10 @@
 
         contentViewsNutupane = new Nutupane(ContentViewVersion, params);
         $scope.controllerName = 'katello_content_views';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Content Views');
+
         contentViewsNutupane.primaryOnly = true;
         contentViewsNutupane.setSearchKey('contentViewsSearch');
 
@@ -39,7 +46,8 @@
         '$scope',
         'Nutupane',
         'ContentViewVersion',
-        'CurrentOrganization'
+        'CurrentOrganization',
+        'translate'
     ];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file-repositories.controller.js

@@ -6,8 +6,11 @@
      *
      * @description
      *   Provides the functionality for the files details repositories page.
+     *
+     * @requires translate
+     *
      */
-    function FileRepositoriesController($scope, Nutupane, Repository, CurrentOrganization) {
+    function FileRepositoriesController($scope, Nutupane, Repository, CurrentOrganization, translate) {
         var repositoriesNutupane,
             params = {
                 'file_id': $scope.$stateParams.fileId,
@@ -16,6 +19,10 @@
 
         repositoriesNutupane = new Nutupane(Repository, params);
         $scope.controllerName = 'katello_repositories';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Repositories');
+
         repositoriesNutupane.primaryOnly = true;
         repositoriesNutupane.setSearchKey('repositoriesSearch');
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/files.controller.js

@@ -8,8 +8,11 @@
      * @description
      *   Handles fetching files and populating Nutupane based on the current
      *   ui-router state.
+     *
+     * @requires translate
+     *
      */
-    function FilesController($scope, Nutupane, File, CurrentOrganization) {
+    function FilesController($scope, Nutupane, File, CurrentOrganization, translate) {
         var nutupane;
 
         var params = {
@@ -20,6 +23,10 @@
 
         nutupane = new Nutupane(File, params);
         $scope.controllerName = 'katello_files';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Files');
+
         nutupane.primaryOnly = true;
 
         $scope.table = nutupane.table;
@@ -30,6 +37,6 @@
         .module('Bastion.files')
         .controller('FilesController', FilesController);
 
-    FilesController.$inject = ['$scope', 'Nutupane', 'File', 'CurrentOrganization'];
+    FilesController.$inject = ['$scope', 'Nutupane', 'File', 'CurrentOrganization', 'translate'];
 
 })();

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

@@ -20,6 +20,9 @@ angular.module('Bastion.host-collections').controller('HostCollectionAddHostsCon
     function ($scope, $state, $location, translate, Nutupane, CurrentOrganization, Host, HostCollection, Notification, newHostDetailsUI) {
         var contentNutupane, params, nutupaneParams;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('List Hosts');
+
         params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",

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

@@ -7,8 +7,11 @@
      *
      * @description
      *   For copying a host collection.
+     *
+     * @requires translate
+     *
      */
-    function HostCollectionCopyController($scope, Notification, HostCollection) {
+    function HostCollectionCopyController($scope, Notification, HostCollection, translate) {
         $scope.copy = function (newName) {
             HostCollection.copy({id: $scope.$stateParams.hostCollectionId, 'host_collection': {name: newName}}, function (response) {
                 $scope.transitionTo('host-collection.info', {hostCollectionId: response.id});
@@ -16,12 +19,14 @@
                 Notification.setErrorMessage(response.data.displayMessage);
             });
         };
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Create Copy');
     }
 
     angular
         .module('Bastion.host-collections')
         .controller('HostCollectionCopyController', HostCollectionCopyController);
 
-    HostCollectionCopyController.$inject = ['$scope', 'Notification', 'HostCollection'];
+    HostCollectionCopyController.$inject = ['$scope', 'Notification', 'HostCollection', 'translate'];
 
 })();

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

@@ -20,6 +20,9 @@ angular.module('Bastion.host-collections').controller('HostCollectionHostsContro
     function ($scope, $location, Notification, translate, Nutupane, CurrentOrganization, Host, HostCollection, newHostDetailsUI) {
         var params, nutupaneParams;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('List Hosts');
+
         params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",

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

@@ -26,6 +26,10 @@ angular.module('Bastion.host-collections').controller('HostCollectionsController
         };
 
         var nutupane = new Nutupane(HostCollection, params);
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Host Collections');
+
         $scope.controllerName = 'katello_host_collections';
         nutupane.primaryOnly = true;
 

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

@@ -5,17 +5,21 @@
  * @requires $scope
  * @requires HostCollection
  * @requires CurrentOrganization
+ * @requires translate
  *
  * @description
  *   Controls the creation of an empty HostCollection object for use by sub-controllers.
  */
 angular.module('Bastion.host-collections').controller('NewHostCollectionController',
-    ['$scope', 'HostCollection', 'CurrentOrganization',
-    function ($scope, HostCollection, CurrentOrganization) {
+    ['$scope', 'HostCollection', 'CurrentOrganization', 'translate',
+    function ($scope, HostCollection, CurrentOrganization, translate) {
 
         $scope.hostCollection = new HostCollection();
         $scope.panel = {loading: false};
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('New Host Collection');
+
         function success() {
             $scope.transitionTo('host-collection.info', {hostCollectionId: $scope.hostCollection.id});
         }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js

@@ -30,6 +30,10 @@ angular.module('Bastion.hosts').factory('Host',
             return _.isString(this.operatingsystem_name) && (this.operatingsystem_name.indexOf("Debian") >= 0 || this.operatingsystem_name.indexOf("Ubuntu") >= 0);
         };
 
+        resource.prototype.rhelLifecycleExpireSoon = function() {
+            return _.isString(this.rhel_lifecycle_status_label) && (this.rhel_lifecycle_status_label.indexOf("Approaching end of") >= 0);
+        };
+
         return resource;
     }]
 );