katello 3.16.2 → 3.17.0.rc1

data/db/migrate/20141222151001_add_host_content_view_environment.rb

@@ -6,7 +6,7 @@ class AddHostContentViewEnvironment < ActiveRecord::Migration[4.2]
     add_column :hostgroups, :content_view_id, :integer, :null => true
     add_column :hostgroups, :lifecycle_environment_id, :integer, :null => true
 
-    [Hostgroup, Host::Managed].each do |model|
+    [::Hostgroup, Host::Managed].each do |model|
       model.find_each do |host|
         lifecycle_environment = host.environment.try(:lifecycle_environment)
         content_view = host.environment.try(:content_view)

data/db/migrate/20180904122343_create_hostgroup_content_facet.katello.rb

@@ -0,0 +1,16 @@
+class CreateHostgroupContentFacet < ActiveRecord::Migration[5.1]
+  def change
+    create_table :katello_hostgroup_content_facets do |t|
+      t.column :hostgroup_id, :integer, :null => false
+      t.column :kickstart_repository_id, :integer, :null => true
+      t.column :content_source_id, :integer, :null => true
+      t.column :content_view_id, :integer, :null => true
+      t.column :lifecycle_environment_id, :integer, :null => true
+    end
+    add_foreign_key :katello_hostgroup_content_facets, :katello_repositories, :column => :kickstart_repository_id
+    add_foreign_key :katello_hostgroup_content_facets, :hostgroups, :column => :hostgroup_id
+    add_foreign_key :katello_hostgroup_content_facets, :katello_content_views, :column => :content_view_id
+    add_foreign_key :katello_hostgroup_content_facets, :smart_proxies, :name => "katello_hostgroup_content_facets_content_source_id_fk", :column => "content_source_id"
+    add_foreign_key :katello_hostgroup_content_facets, :katello_environments, :column => :lifecycle_environment_id
+  end
+end

data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb

@@ -0,0 +1,53 @@
+class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
+  def up
+    if User.where(login: User::ANONYMOUS_ADMIN).exists?
+      User.as_anonymous_admin do
+        copy_data_from_hostgroup
+      end
+    end
+
+    change_table :hostgroups do |table|
+      table.remove(
+        :content_source_id,
+        :kickstart_repository_id,
+        :content_view_id,
+        :lifecycle_environment_id
+      )
+    end
+  end
+
+  def down
+    change_table :hostgroups do |t|
+      t.column :kickstart_repository_id, :integer, :null => true
+      t.column :content_source_id, :integer, :null => true
+      t.column :content_view_id, :integer, :null => true
+      t.column :lifecycle_environment_id, :integer, :null => true
+    end
+  end
+
+  def copy_data_from_hostgroup
+    hg_table = ::Hostgroup.arel_table
+    hostgroups = ::Hostgroup.unscoped.where(
+           hg_table[:content_source_id].eq(nil)
+      .and(hg_table[:kickstart_repository_id].eq(nil))
+      .and(hg_table[:content_view_id].eq(nil))
+      .and(hg_table[:lifecycle_environment_id].eq(nil))
+      .not)
+    hostgroups.in_batches do |batch|
+      batch.pluck(
+        :id,
+        :content_source_id,
+        :kickstart_repository_id,
+        :content_view_id,
+        :lifecycle_environment_id
+      ).each do |hostgroup_id, content_source_id, kickstart_repository_id, content_view_id, lifecycle_environment_id|
+        content_facet = ::Katello::Hostgroup::ContentFacet.find_or_create_by(hostgroup_id: hostgroup_id)
+        content_facet.content_source_id = content_source_id
+        content_facet.kickstart_repository_id = kickstart_repository_id
+        content_facet.content_view_id = content_view_id
+        content_facet.lifecycle_environment_id = lifecycle_environment_id
+        content_facet.save!
+      end
+    end
+  end
+end

data/db/migrate/20200610112009_remove_audits_of_root_repo_with_content_id.rb

@@ -0,0 +1,9 @@
+class RemoveAuditsOfRootRepoWithContentId < ActiveRecord::Migration[6.0]
+  def change
+    audit_records = Audit.where(
+      :auditable_type => 'Katello::RootRepository',
+      :action => 'update')
+    audit_records = audit_records.reject { |ar| ar.audited_changes['content_id'].nil? }
+    audit_records.map(&:destroy!)
+  end
+end

data/db/migrate/20200701150946_add_auto_enabled_to_root_repository.rb

@@ -0,0 +1,5 @@
+class AddAutoEnabledToRootRepository < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_root_repositories, :auto_enabled, :boolean, default: true
+  end
+end

data/db/seeds.d/75-job_templates.rb

@@ -7,9 +7,9 @@ if Katello.with_remote_execution?
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
         # import! was renamed to import_raw! around 1.3.1
         if JobTemplate.respond_to?('import_raw!')
-          template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
         else
-          template = JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import!(File.read(template), :default => true, :lock => true, :update => sync)
         end
 
         template.organizations << Organization.unscoped.all if template&.organizations&.empty?

data/engines/bastion/app/assets/javascripts/bastion/components/nutupane.factory.js

@@ -295,12 +295,14 @@ angular.module('Bastion.components').factory('Nutupane',
                     },
                     excluded: {
                         ids: []
-                    }
+                    },
+                    allResultsSelected: false
                 };
 
                 if (self.table.allResultsSelected) {
                     selected.included.search = self.table.searchTerm || '';
                     selected.excluded.ids = _.map(self.getDeselected(), identifier);
+                    selected.allResultsSelected = true;
                 } else {
                     selectedRows = self.table.getSelected();
                     selected.included.ids = _.map(selectedRows, identifier);

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

@@ -9,13 +9,14 @@
  * @requires ActivationKey
  * @requires ContentHostsHelper
  * @requires CurrentOrganization
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for activation key associations.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization', 'Host',
-    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization, Host) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization', 'Host', 'simpleContentAccessEnabled',
+    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization, Host, simpleContentAccessEnabled) {
         var contentHostsNutupane, nutupaneParams, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -59,5 +60,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
 
         $scope.memory = ContentHostsHelper.memory;
+
+        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
     }]
 );

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

@@ -11,17 +11,19 @@
  * @requires Organization
  * @requires Notification
  * @requires ApiErrorHandler
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for the activation key details action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'Notification', 'ApiErrorHandler',
-    function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, Notification, ApiErrorHandler) {
+    ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'Notification', 'ApiErrorHandler', 'simpleContentAccessEnabled',
+    function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, Notification, ApiErrorHandler, simpleContentAccessEnabled) {
         $scope.defaultRoles = ['Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
         $scope.defaultUsages = ['Production', 'Development/Test', 'Disaster Recovery'];
 
         $scope.purposeAddonsCount = 0;
+        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
 
         $scope.organization = Organization.get({id: CurrentOrganization}, function(org) {
             $scope.purposeAddonsCount += org.system_purposes.addons.length;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-add-subscriptions.html

@@ -13,7 +13,7 @@
   </div>
 
   <span data-block="no-rows-message" translate>
-     You currently don't have any Products to subscribe to, you can add Products after selecting 'Products' under 'Content' in the main menu
+     You currently don't have any Products to subscribe to. You can add Products after selecting 'Products' under 'Content' in the main menu.
   </span>
 
   <span data-block="no-search-results-message" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html

@@ -14,7 +14,7 @@
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name" sortable><span translate>Name</span></th>
-          <th bst-table-column="status" translate>
+          <th bst-table-column="status" ng-if="!simpleContentAccessEnabled" translate>
             Subscription Status
           </th>
           <th bst-table-column="environment" sortable><span translate>Environment</span></th>
@@ -32,7 +32,7 @@
               {{ host.name }}
             </a>
           </td>
-          <td bst-table-cell>
+          <td bst-table-cell ng-if="!simpleContentAccessEnabled">
             <span ng-class="getHostStatusIcon(host.subscription_global_status)">
             </span>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html

@@ -40,7 +40,7 @@
           </span>
         </a>
       </li>
-      <li ng-class="{active: stateIncludes('activation-key.subscriptions')}">
+      <li ng-class="{active: stateIncludes('activation-key.subscriptions')}"  ng-hide="simpleContentAccessEnabled">
         <a ui-sref="activation-key.subscriptions.list">
           <span translate>
             Subscriptions

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

@@ -57,12 +57,15 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.initialLoad = true;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
+        $scope.allHostsSelected = hostIds.allResultsSelected;
 
         $scope.errataActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')
         };
 
-        if (hostIds.included.ids) {
+        if ($scope.allHostsSelected) {
+            $scope.errataActionFormValues.scopedSearch = hostIds.included.search;
+        } else if (hostIds.included.ids.length > 0) {
             $scope.errataActionFormValues.hostIds = hostIds.included.ids.join(',');
         }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js

@@ -119,6 +119,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
 
             $scope.content.confirm = false;
             $scope.packageActionFormValues.customize = customize;
+            $scope.allHostsSelected = selectedHosts.allResultsSelected;
 
             if (!action) {
                 action = $scope.content.action;
@@ -134,7 +135,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
                 $scope.packageActionFormValues.remoteAction = 'package_' + action;
             }
 
-            if (selectedHosts.included.ids) {
+            if ($scope.allHostsSelected) {
+                $scope.packageActionFormValues.scopedSearch = selectedHosts.included.search;
+            } else if (selectedHosts.included.ids.length > 0) {
                 $scope.packageActionFormValues.hostIds = selectedHosts.included.ids.join(',');
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js

@@ -30,6 +30,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscription
             function getBulkSubscriptionParams() {
                 var bulkParams = hostIds;
                 bulkParams.subscriptions = SubscriptionsHelper.getSelectedSubscriptionAmounts($scope.table);
+                bulkParams['organization_id'] = CurrentOrganization; // eslint-disable-line camelcase
                 return bulkParams;
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-traces-modal.controller.js

@@ -9,6 +9,7 @@
  * @requires Nutupane
  * @requires BastionConfig
  * @requires hostIds
+ * @requires HostTracesResolve
  * @required ContentHostsHelper
  * @requires translate
  *
@@ -17,8 +18,8 @@
  */
 /*jshint camelcase:false*/
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkTracesController',
-    ['$scope', '$uibModalInstance', 'HostBulkAction', 'Notification', 'Nutupane', 'BastionConfig', 'hostIds', 'ContentHostsHelper', 'translate',
-    function ($scope, $uibModalInstance, HostBulkAction, Notification, Nutupane, BastionConfig, hostIds, ContentHostsHelper, translate) {
+    ['$scope', '$uibModalInstance', 'HostBulkAction', 'Notification', 'Nutupane', 'BastionConfig', 'hostIds', 'HostTracesResolve', 'ContentHostsHelper', 'translate',
+    function ($scope, $uibModalInstance, HostBulkAction, Notification, Nutupane, BastionConfig, hostIds, HostTracesResolve, ContentHostsHelper, translate) {
 
         var tracesNutupane = new Nutupane(HostBulkAction, hostIds, 'traces');
         tracesNutupane.enableSelectAllResults();
@@ -45,7 +46,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkTracesContro
                 });
             };
             /* eslint-disable camelcase */
-            HostBulkAction.resolveTraces({trace_ids: traceids}, onSuccess, onFailure);
+            HostTracesResolve.resolve({trace_ids: traceids}, onSuccess, onFailure);
             /* eslint-enable camelcase */
         };
 

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

@@ -3,7 +3,6 @@
 
   <div data-block="modal-body">
     <h4 translate>Assign Lifecycle Environment and Content View</h4>
-
     <div class="row">
       <div class="col-sm-12">
         <div bst-global-notification></div>
@@ -56,6 +55,13 @@
       </button>
 
     </form>
+    <div class="help-block" style="text-align:left;">
+      <p translate>
+        Changing the Content View will not affect the Content Hosts until their next checkin.
+        To update the Content Hosts immediately run the following command:
+      </p>
+      <code># subscription-manager refresh</code>
+    </div>
   </div>
 
   <div data-block="modal-footer">

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

@@ -8,6 +8,7 @@
       <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
       <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
       <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
+      <input type="hidden" ng-if="allHostsSelected" name="scoped_search" ng-value="errataActionFormValues.scopedSearch"/>
     </form>
 
     <div bst-alert="info" ng-show="showConfirm">

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

@@ -38,6 +38,7 @@
       <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
       <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
       <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
+      <input type="hidden" ng-if="allHostsSelected" name="scoped_search" ng-value="packageActionFormValues.scopedSearch"/>
     </form>
 
     <div ng-form name="systemContentForm" class="form" ng-hide="content.workingMode || denied('edit_hosts')" novalidate>

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

@@ -13,6 +13,7 @@
  * @requires Notification
  * @requires CurrentOrganization
  * @requires ContentHostsHelper
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality specific to Content Hosts for use with the Nutupane UI pattern.
@@ -20,8 +21,8 @@
  *   within the table.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsController',
-    ['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer',
-    function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer) {
+    ['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer', 'simpleContentAccessEnabled',
+    function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer, simpleContentAccessEnabled) {
         var nutupane, params, query;
 
         if ($location.search().search) {
@@ -47,6 +48,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
 
         $scope.table = nutupane.table;
         $scope.nutupane = nutupane;
+        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
 
         // @TODO begin hack necessary because of foreman API bug http://projects.theforeman.org/issues/13877
         $scope.table.sortBy = function (column) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js

@@ -134,7 +134,7 @@ angular.module('Bastion.content-hosts').config(['$stateProvider', function ($sta
         controller: 'ContentHostAddSubscriptionsController',
         templateUrl: 'content-hosts/details/views/content-host-add-subscriptions.html',
         ncyBreadcrumb: {
-            label: "{{ 'Add Subscriptipons' | translate }}",
+            label: "{{ 'Add Subscriptions' | translate }}",
             parent: 'content-host.info'
         }
     });

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

@@ -42,6 +42,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         });
 
         $scope.showVersionAlert = false;
+        $scope.showCVAlert = false;
         $scope.editContentView = false;
         $scope.disableEnvironmentSelection = false;
         $scope.environments = [];
@@ -62,6 +63,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         };
 
         $scope.cancelContentViewUpdate = function () {
+            $scope.showCVAlert = false;
             if ($scope.editContentView) {
                 $scope.editContentView = false;
                 $scope.host.content_facet_attributes['lifecycle_environment'] = $scope.originalEnvironment;
@@ -76,6 +78,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
                 $scope.originalEnvironment = response.content_facet_attributes.lifecycle_environment;
             });
             $scope.disableEnvironmentSelection = false;
+            $scope.showCVAlert = false;
         };
 
         $scope.releaseVersions = function () {
@@ -116,14 +119,17 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
             $scope.saveSubscriptionFacet($scope.host);
         };
 
-        $scope.contentViews = function () {
+        $scope.availableContentViews = function () {
             var deferred = $q.defer();
 
             ContentView.queryUnpaged({ 'environment_id': $scope.host.content_facet_attributes.lifecycle_environment.id}, function (response) {
                 deferred.resolve(response.results);
                 $scope.contentViews = response.results;
+                $scope.showCVAlert = true;
             });
 
+            $scope.showCVAlert = true;
+
             return deferred.promise;
         };
 

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

@@ -13,13 +13,14 @@
  * @requires ApiErrorHandler
  * @requires deleteHostOnUnregister
  * @requires ContentHostsHelper
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
-    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper',
-    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper) {
+    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled',
+    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled) {
         $scope.menuExpander = MenuExpander;
 
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
@@ -34,6 +35,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
         $scope.defaultServiceLevels = ['Self-Support', 'Standard', 'Premium'];
 
         $scope.purposeAddonsCount = 0;
+        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
 
         $scope.panel = {
             error: false,

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

@@ -29,7 +29,7 @@
   </div>
 
   <span data-block="no-rows-message" translate>
-      You currently don't have any Products to subscribe to, you can add Products after selecting 'Products' under 'Content' in the main menu
+      You currently don't have any Products to subscribe to. You can add Products after selecting 'Products' under 'Content' in the main menu.
   </span>
 
   <span data-block="no-search-results-message" translate>

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

@@ -69,6 +69,7 @@
         </a>
       </li>
       <li uib-dropdown
+          ng-if="!simpleContentAccessEnabled"
           ng-class="{active: stateIncludes('content-host.subscriptions.list') || stateIncludes('content-host.subscriptions.add')}">
         <a translate
            ui-sref="content-host.subscriptions.list">

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

@@ -94,15 +94,14 @@
           {{ host.subscription_status_label }}
         </dd>
 
-        <dt translate>Details</dt>
-        <dd>
+        <dt translate ng-if="!simpleContentAccessEnabled">Details</dt>
+        <dd ng-if="!simpleContentAccessEnabled">
           <ul class="compliance-reasons">
             <li ng-repeat="reason in host.subscription_facet_attributes.compliance_reasons">{{ reason }}</li>
           </ul>
         </dd>
 
-        <dt translate>Auto-Attach Details</dt>
-        <dd ng-if="simpleContentAccessEnabled" translate>Not Applicable</dd>
+        <dt translate ng-if="!simpleContentAccessEnabled">Auto-Attach Details</dt>
         <dd ng-if="!simpleContentAccessEnabled"
             bst-edit-select="host.subscription_facet_attributes.autoheal"
             selector="host.subscription_facet_attributes.autoheal"
@@ -274,13 +273,22 @@
         </dd>
 
         <dt translate>Content View</dt>
-        <dd bst-edit-select="host.content_facet_attributes.content_view.name"
+        <dd>
+          <div bst-edit-select="host.content_facet_attributes.content_view.name"
             readonly="denied('edit_hosts', host)"
             selector="host.content_facet_attributes.content_view.id"
-            options="contentViews()"
+            options="availableContentViews()"
             on-cancel="cancelContentViewUpdate()"
             on-save="saveContentView(host)"
             edit-trigger="editContentView">
+            </div>
+            <div class="help-block" ng-show="showCVAlert">
+              <p translate>
+                Changing the Content View will not affect the Content Host until its next checkin.
+                To update the Content Host immediately run the following command:
+              </p>
+              <code># subscription-manager refresh</code>
+            </div>
         </dd>
 
         <dt bst-feature-flag="lifecycle_environments">

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

@@ -14,7 +14,7 @@
   </div>
 
   <span data-block="no-rows-message" translate>
-     You currently don't have any Subscriptions associated with this Content Host, you can add Subscriptions after selecting the 'Add' tab.
+     You currently don't have any Subscriptions associated with this Content Host. You can add Subscriptions after selecting the 'Add' tab.
   </span>
 
   <span data-block="no-search-results-message" translate>

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

@@ -39,7 +39,7 @@
           <a ng-click="openSetReleaseVersionModal()" disable-link="table.numSelected === 0" translate>Set Release Version</a>
         </li>
 
-        <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+        <li role="menuitem" ng-show="permitted('edit_hosts') && !simpleContentAccessEnabled" ng-class="{disabled: table.numSelected === 0}">
           <a ng-click="openSubscriptionsModal()" disable-link="table.numSelected === 0" translate>Manage Subscriptions</a>
         </li>
 
@@ -78,8 +78,8 @@
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="name" sortable><span translate>Name</span></th>
-          <th bst-table-column="subscription_status" sortable>
-            {{ "Subscription Status" | translate }}
+          <th bst-table-column="subscription_status" ng-hide="simpleContentAccessEnabled" sortable>
+            {{ 'Subscription Status' | translate }}
           </th>
           <th bst-table-column="status">
             <span translate>Installable Updates</span>
@@ -102,9 +102,9 @@
               {{ host.name }}
             </a>
           </td>
-          <td bst-table-cell>
-          <span ng-class="table.getHostStatusIcon(host.subscription_global_status)">
-          </span>
+          <td bst-table-cell ng-hide="simpleContentAccessEnabled">
+            <span ng-class="table.getHostStatusIcon(host.subscription_global_status)">
+            </span>
           </td>
           <td>
             <a ui-sref="content-host.errata.index({hostId: host.id})">

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

@@ -11,13 +11,14 @@
  * @requires HostCollection
  * @requires Notification
  * @requires ApiErrorHandler
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for the host collection details action pane.
  */
 angular.module('Bastion.host-collections').controller('HostCollectionDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'Host', 'ContentHostsModalHelper', 'HostCollection', 'Notification', 'ApiErrorHandler',
-    function ($scope, $state, $q, translate, Host, ContentHostsModalHelper, HostCollection, Notification, ApiErrorHandler) {
+    ['$scope', '$state', '$q', 'translate', 'Host', 'ContentHostsModalHelper', 'HostCollection', 'Notification', 'ApiErrorHandler', 'simpleContentAccessEnabled',
+    function ($scope, $state, $q, translate, Host, ContentHostsModalHelper, HostCollection, Notification, ApiErrorHandler, simpleContentAccessEnabled) {
         $scope.panel = {
             error: false,
             loading: true
@@ -27,6 +28,8 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
             $scope.panel.loading = false;
         }
 
+        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
+
         $scope.hostCollection = HostCollection.get({id: $scope.$stateParams.hostCollectionId}, function (hostCollection) {
             $scope.$broadcast('hostCollection.loaded', hostCollection);
             $scope.panel.loading = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html

@@ -106,7 +106,7 @@
           </a>
         </li>
 
-        <li bst-feature-flag="subscription_management">
+        <li bst-feature-flag="subscription_management" ng-hide="simpleContentAccessEnabled">
           <a translate ng-click="openSubscriptionsModal()">
             Subscription Management
           </a>

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

@@ -26,8 +26,7 @@ angular.module('Bastion.hosts').factory('HostBulkAction',
             releaseVersion: {method: 'PUT', params: {action: 'release_version'}},
             availableIncrementalUpdates: {method: 'POST', isArray: true, params: {action: 'available_incremental_updates'}},
             moduleStreams: {method: 'POST', params: {action: 'module_streams'}},
-            traces: {method: 'POST', params: {action: 'traces'}},
-            resolveTraces: {method: 'PUT', isArray: true, params: {action: 'resolve_traces'}}
+            traces: {method: 'POST', params: {action: 'traces'}}
         });
 
     }]

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

@@ -0,0 +1,18 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.hosts.factory:HostTracesResolve
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for resolving traces on a set of systems.
+ */
+angular.module('Bastion.hosts').factory('HostTracesResolve',
+    ['BastionResource', function (BastionResource) {
+
+        return BastionResource('katello/api/v2/traces/:action', {}, {
+            resolve: {method: 'PUT', isArray: true, params: {action: 'resolve'}}
+        });
+
+    }]
+);