katello 4.11.1 → 4.12.0.rc1

data/app/models/katello/host/subscription_facet.rb

@@ -49,7 +49,6 @@ module Katello
       end
 
       def import_database_attributes(consumer_params = candlepin_consumer.consumer_attributes)
-        update_subscription_status(consumer_params[:entitlementStatus]) unless consumer_params[:entitlementStatus].blank?
         update_hypervisor(consumer_params)
         update_guests(consumer_params)
 
@@ -182,24 +181,6 @@ module Katello
         param
       end
 
-      def update_subscription_status(status_override = nil)
-        update_status(::Katello::SubscriptionStatus, status_override: status_override)
-
-        host.refresh_global_status!
-      end
-
-      def update_purpose_status(sla_status: nil, role_status: nil, usage_status: nil, addons_status: nil, purpose_status: nil)
-        # if this method is ever called such that we aren't sending the status params, we should pass along the candlepin_consumer
-        # in order to reduce HTTP requests into candlepin for each Status
-        update_status(::Katello::PurposeSlaStatus, status_override: sla_status)
-        update_status(::Katello::PurposeRoleStatus, status_override: role_status)
-        update_status(::Katello::PurposeUsageStatus, status_override: usage_status)
-        update_status(::Katello::PurposeAddonsStatus, status_override: addons_status)
-        update_status(::Katello::PurposeStatus, status_override: purpose_status)
-
-        host.refresh_global_status!
-      end
-
       def self.override_dmi_uuid?(host_uuid)
         Setting[:host_dmi_uuid_duplicates].include?(host_uuid)
       end

data/app/models/katello/host_tracer.rb

@@ -2,10 +2,14 @@ module Katello
   class HostTracer < Katello::Model
     include Katello::Authorization::HostTracer
 
+    TRACE_APP_TYPE_STATIC = 'static'.freeze
+    TRACE_APP_TYPE_SESSION = 'session'.freeze
+    TRACE_APP_TYPE_DAEMON = 'daemon'.freeze
+
     belongs_to :host, :inverse_of => :host_traces, :class_name => '::Host::Managed'
 
-    scope :reboot_required, -> { where(app_type: 'static') }
-    scope :selectable, -> { where.not(app_type: 'session') }
+    scope :reboot_required, -> { where(app_type: TRACE_APP_TYPE_STATIC) }
+    scope :selectable, -> { where.not(app_type: TRACE_APP_TYPE_SESSION) }
 
     validates :application, :length => {:maximum => 255}, :presence => true
     validates :app_type, :length => {:maximum => 255}, :presence => true
@@ -16,14 +20,14 @@ module Katello
     scoped_search :on => :helper, :complete_value => true
 
     def reboot_required?
-      self.app_type == 'static'
+      self.app_type == TRACE_APP_TYPE_STATIC
     end
 
     def restart_command
       case self.app_type
-      when 'static'
+      when TRACE_APP_TYPE_STATIC
         'reboot'
-      when 'session'
+      when TRACE_APP_TYPE_SESSION
         nil
       else
         self.helper

data/app/models/katello/installed_deb.rb

@@ -3,6 +3,7 @@ module Katello
     has_many :host_installed_debs, :class_name => "Katello::HostInstalledDeb", :dependent => :destroy, :inverse_of => :installed_deb
     has_many :hosts, :through => :host_installed_debs, :class_name => "::Host"
 
+    scoped_search :on => :id, :complete_value => true
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :version
     scoped_search :on => :architecture

data/app/models/katello/repository.rb

@@ -30,7 +30,7 @@ module Katello
     ANSIBLE_COLLECTION_TYPE = 'ansible_collection'.freeze
     GENERIC_TYPE = 'generic'.freeze
 
-    EXPORTABLE_TYPES = [YUM_TYPE, FILE_TYPE, ANSIBLE_COLLECTION_TYPE, DOCKER_TYPE].freeze
+    EXPORTABLE_TYPES = [YUM_TYPE, FILE_TYPE, ANSIBLE_COLLECTION_TYPE, DOCKER_TYPE, DEB_TYPE].freeze
 
     define_model_callbacks :sync, :only => :after
 
@@ -752,7 +752,8 @@ module Katello
           return true
         else
           errors.add(:base, _("Repository cannot be deleted since it has already been included in a published Content View. " \
-                              "Please delete all Content View versions containing this repository before attempting to delete it."))
+                              "Please delete all Content View versions containing this repository before attempting to delete it "\
+                              "or use --remove-from-content-view-versions flag to automatically remove the repository from all published versions."))
 
           return false
         end

data/app/models/katello/trace_status.rb

@@ -4,6 +4,7 @@ module Katello
     REQUIRE_PROCESS_RESTART = 1
     UP_TO_DATE = 0
     UNKNOWN = -1
+
     def self.status_name
       N_("Traces")
     end
@@ -35,9 +36,12 @@ module Katello
     end
 
     def to_status(_options = {})
-      if host.host_traces.reboot_required.any?
+      traces = host.host_traces.pluck(:app_type)
+      traces.delete(Katello::HostTracer::TRACE_APP_TYPE_SESSION)
+
+      if traces.include?(Katello::HostTracer::TRACE_APP_TYPE_STATIC)
         REQUIRE_REBOOT
-      elsif host.host_traces.where.not(:app_type => "session").any?
+      elsif !traces.empty?
         REQUIRE_PROCESS_RESTART
       else
         UP_TO_DATE

data/app/overrides/add_organization_attributes.rb

@@ -11,26 +11,8 @@ Deface::Override.new(:virtual_path => "taxonomies/_form",
                      :text => '<% if taxonomy.is_a?(Location) %><%= render_original %><% end %>'
                     )
 
-# Add organization attributes to org creation
-Deface::Override.new(:virtual_path => "taxonomies/_step1",
-                     :name => "add_organization_attributes_on_create",
-                     :insert_after => 'erb[loud]:contains("text_f"):contains(":name")',
-                     :partial => 'overrides/organizations/step_1_override')
-
 # Add organization attributes to org edit
 Deface::Override.new(:virtual_path => "taxonomies/_form",
                      :name => "add_organization_attributes_on_edit",
                      :insert_after => 'erb[loud]:contains("text_f"):contains(":name")',
                      :partial => 'overrides/organizations/edit_override')
-
-# Add Simple Content Access column to org table
-Deface::Override.new(:virtual_path => "taxonomies/index",
-                     :name => "add_sca_column_on_index",
-                     :insert_before => 'table th:last-child', # make it the second-to-last column
-                     :partial => 'overrides/organizations/index_header_override')
-
-# Add Simple Content Access cells to org table
-Deface::Override.new(:virtual_path => "taxonomies/index",
-                    :name => "add_sca_attributes_on_index",
-                    :insert_before => 'tbody td:last-child',
-                    :partial => 'overrides/organizations/index_row_override')

data/app/presenters/katello/host_deb_presenter.rb

@@ -0,0 +1,23 @@
+module Katello
+  class HostDebPresenter < SimpleDelegator
+    attr_accessor :installed_package, :upgradable_versions, :deb_id
+
+    def initialize(installed_package, upgradable_versions, deb_id)
+      @installed_package = installed_package
+      @upgradable_versions = upgradable_versions
+      @deb_id = deb_id
+      super(@installed_package)
+    end
+
+    def self.with_latest(packages, host)
+      upgradable_packages_map = ::Katello::Deb.installable_for_hosts([host]).select(:id, :name, :architecture, :version).order(version: :desc).group_by { |i| [i.name, i.architecture] }
+      installed_packages_map = ::Katello::Deb.where(version: packages.map(&:version)).select(:id, :architecture, :name).group_by { |i| [i.name, i.architecture] }
+
+      packages.map do |p|
+        upgrades = upgradable_packages_map[[p.name, p.architecture]]&.pluck(:version)
+        installed = installed_packages_map[[p.name, p.architecture]]&.first&.id
+        HostDebPresenter.new(p, upgrades, installed)
+      end
+    end
+  end
+end

data/app/services/katello/candlepin/consumer.rb

@@ -118,10 +118,6 @@ module Katello
         self.class.friendly_compliance_reasons(Resources::Candlepin::Consumer.compliance(uuid)['reasons'])
       end
 
-      def system_purpose
-        @system_purpose ||= Katello::Candlepin::SystemPurpose.new(purpose_compliance)
-      end
-
       def entitlements?
         # use cahced consumer_attributes if possible
         count = @consumer_attributes.try(:[], 'entitlementCount')

data/app/services/katello/candlepin/event_handler.rb

@@ -26,9 +26,9 @@ module Katello
           when /pool\.deleted/
             message_handler.delete_pool
           when /^compliance\.created/
-            reindex_subscription_status
+            event_no_longer_handled
           when /system_purpose_compliance\.created/
-            reindex_purpose_status
+            event_no_longer_handled
           when /owner_content_access_mode\.modified/
             message_handler.handle_content_access_mode_modified
           end
@@ -37,31 +37,12 @@ module Katello
 
       private
 
-      def subscription_facet
-        message_handler.subscription_facet
+      def event_no_longer_handled
+        @logger.error "Received #{message_handler.subject} event from Candlepin. Handling of this event is no longer supported."
       end
 
-      def reindex_subscription_status
-        if message_handler.status.nil?
-          @logger.debug "skip re-indexing of empty #{message_handler.subject} status #{message_handler.consumer_uuid}"
-          return
-        end
-
-        reindex_consumer do
-          subscription_facet.update_subscription_status(message_handler.status)
-          subscription_facet.update_compliance_reasons(message_handler.reasons)
-        end
-      end
-
-      def reindex_purpose_status
-        reindex_consumer do
-          return if subscription_facet.host.organization.simple_content_access?
-          subscription_facet.update_purpose_status(role_status: message_handler.system_purpose.role_status,
-                                                   usage_status: message_handler.system_purpose.usage_status,
-                                                   addons_status: message_handler.system_purpose.addons_status,
-                                                   sla_status: message_handler.system_purpose.sla_status,
-                                                   purpose_status: message_handler.system_purpose.overall_status)
-        end
+      def subscription_facet
+        message_handler.subscription_facet
       end
 
       def reindex_consumer

data/app/services/katello/candlepin/message_handler.rb

@@ -42,13 +42,6 @@ module Katello
         content['consumerUuid']
       end
 
-      def system_purpose
-        if subject == 'system_purpose_compliance.created' && @system_purpose.nil?
-          @system_purpose = Katello::Candlepin::SystemPurpose.new(event_data)
-        end
-        @system_purpose
-      end
-
       def pool_id
         if subject == 'pool.created' || subject == 'pool.deleted'
           content['entityId']
@@ -105,21 +98,8 @@ module Katello
         end
 
         org = ::Organization.find_by!(label: owner['key'])
-        hosts = org.hosts
-
-        if event_data['contentAccessMode'] == 'org_environment'
-          Katello::HostStatusManager.clear_syspurpose_status(hosts)
-          Katello::HostStatusManager.update_subscription_status_to_sca(hosts)
-        elsif event_data['contentAccessMode'] == 'entitlement'
-          cp_consumer_uuids = hosts.joins(:subscription_facet).pluck("#{Katello::Host::SubscriptionFacet.table_name}.uuid")
-          cp_consumer_uuids.each do |uuid|
-            Katello::Resources::Candlepin::Consumer.compliance(uuid)
-            Katello::Resources::Candlepin::Consumer.purpose_compliance(uuid)
-          rescue => e
-            Rails.logger.error("Error encountered while fetching compliance for consumer #{uuid}: #{e.message}")
-          end
-        end
 
+        Rails.logger.error "Received content_access_mode_modified event for org #{org.label}. This event is no longer supported."
         org.simple_content_access?(cached: false)
       end
 

data/app/services/katello/host/profiles_uploader.rb

@@ -6,15 +6,20 @@ module Katello
         @host = host
       end
 
+      # rubocop:disable Metrics/MethodLength
       def upload
+        if @host.nil?
+          Rails.logger.warn("Host was not specified; skipping")
+          return false
+        elsif @host.content_facet.nil? || @host.content_facet.uuid.nil?
+          Rails.logger.warn("Host with ID %s has no content facet; skipping" % @host.id)
+          return false
+        end
+
         profiles = JSON.parse(@profile_string)
         #free the huge string from the memory
         @profile_string = 'TRIMMED'.freeze
-        if @host.nil?
-          Rails.logger.warn("Host was not specified; continuing")
-        elsif @host.content_facet.nil? || @host.content_facet.uuid.nil?
-          Rails.logger.warn("Host with ID %s has no content facet; continuing" % @host.id)
-        elsif profiles.try(:has_key?, "deb_package_profile")
+        if profiles.try(:has_key?, "deb_package_profile")
           # remove this when deb_package_profile API is removed
           payload = profiles.dig("deb_package_profile", "deb_packages") || []
           import_deb_package_profile(payload)
@@ -37,9 +42,15 @@ module Katello
           module_streams.each do |module_stream_payload|
             import_module_streams(module_stream_payload)
           end
-
         end
+
+        # Just to update the internal cache
+        @host.content_facet.tracer_installed?(force_update_cache: true)
+        @host.content_facet.host_tools_installed?(force_update_cache: true)
+
+        true
       end
+      # rubocop:enable Metrics/MethodLength
 
       def trigger_applicability_generation
         if @host.nil?

data/app/services/katello/host_status_manager.rb

@@ -2,29 +2,7 @@ module Katello
   class HostStatusManager
     STATUSES = [
       Katello::ErrataStatus,
-      Katello::SubscriptionStatus,
-      Katello::PurposeSlaStatus,
-      Katello::PurposeRoleStatus,
-      Katello::PurposeUsageStatus,
-      Katello::PurposeAddonsStatus,
-      Katello::PurposeStatus,
       Katello::RhelLifecycleStatus,
       Katello::TraceStatus].freeze
-
-    PURPOSE_STATUS = [
-      Katello::PurposeStatus,
-      Katello::PurposeAddonsStatus,
-      Katello::PurposeRoleStatus,
-      Katello::PurposeSlaStatus,
-      Katello::PurposeUsageStatus].freeze
-
-    def self.update_subscription_status_to_sca(hosts)
-      HostStatus::Status.where(host: hosts, type: Katello::SubscriptionStatus.to_s).update(status: Katello::SubscriptionStatus::DISABLED)
-    end
-
-    def self.clear_syspurpose_status(hosts)
-      host_purpose = HostStatus::Status.where(type: ::Katello::HostStatusManager::PURPOSE_STATUS.map(&:to_s)).where('host_id in (?)', hosts.pluck(:id))
-      host_purpose.destroy_all
-    end
   end
 end

data/app/services/katello/organization_creator.rb

@@ -27,9 +27,9 @@ module Katello
       end
     end
 
-    def initialize(organization, sca: true)
+    def initialize(organization)
       @organization = organization
-      @content_access_mode = sca ? 'org_environment' : 'entitlement'
+      @content_access_mode = 'org_environment'
     end
 
     def seed!

data/app/services/katello/pulp3/api/apt.rb

@@ -21,7 +21,7 @@ module Katello
         end
 
         def copy_api
-          PulpDebClient::CopyApi.new(api_client)
+          PulpDebClient::DebCopyApi.new(api_client)
         end
       end
     end

data/app/services/katello/pulp3/content_view_version/export.rb

@@ -10,9 +10,9 @@ module Katello
         attr_reader :smart_proxy, :content_view_version, :destination_server, :from_content_view_version, :repository, :base_path
         def self.create(options)
           if options.delete(:format) == SYNCABLE
-            SyncableFormatExport.new(options)
+            SyncableFormatExport.new(**options)
           else
-            self.new(options)
+            self.new(**options)
           end
         end
 

data/app/services/katello/pulp3/content_view_version/metadata_generator.rb

@@ -45,6 +45,7 @@ module Katello
         def generate_repository_metadata(repo)
           repo.slice(:name, :label, :description, :arch, :content_type, :unprotected,
                      :checksum_type, :os_versions, :major, :minor,
+                     :deb_releases, :deb_components, :deb_architectures,
                      :download_policy, :mirroring_policy).
             merge(product: generate_product_metadata(repo.product),
                   gpg_key: generate_gpg_metadata(repo.gpg_key),

data/app/services/katello/pulp3/content_view_version/metadata_map.rb

@@ -102,6 +102,9 @@ module Katello
               download_policy: repo[:download_policy],
               mirroring_policy: repo[:mirroring_policy],
               redhat: repo[:redhat],
+              deb_releases: repo[:deb_releases],
+              deb_components: repo[:deb_components],
+              deb_architectures: repo[:deb_architectures],
               product: product_for_repo(repo),
               gpg_key: gpg_key_for_repo(repo),
               content: content

data/app/services/katello/pulp3/repository/apt.rb

@@ -73,18 +73,27 @@ module Katello
           "/pulp/deb/#{repo.relative_path}/".sub('//', '/')
         end
 
-        def multi_copy_units(repo_id_map, dependency_solving)
+        def multi_copy_units(repo_id_map, _dependency_solving)
           tasks = []
 
           if repo_id_map.values.pluck(:content_unit_hrefs).flatten.any?
             data = PulpDebClient::Copy.new
-            data.dependency_solving = dependency_solving
+            data.dependency_solving = false
             data.config = []
             repo_id_map.each do |source_repo_ids, dest_repo_id_map|
               dest_repo = ::Katello::Repository.find(dest_repo_id_map[:dest_repo])
               dest_repo_href = ::Katello::Pulp3::Repository::Apt.new(dest_repo, SmartProxy.pulp_primary).repository_reference.repository_href
               content_unit_hrefs = dest_repo_id_map[:content_unit_hrefs]
               # Not needed during incremental update due to dest_base_version
+              # -> Unless incrementally updating a CV repo that is a soft copy of its library instance.
+              # -> I.e. no filters and not an incremental version.
+              unless dest_repo_id_map[:base_version]
+                # Don't perform extra content actions if the repo is a soft copy of its library instance.
+                # Taken care of by the IncrementalUpdate action.
+                unless dest_repo.soft_copy_of_library?
+                  tasks << remove_all_content_from_repo(dest_repo_href)
+                end
+              end
               source_repo_ids.each do |source_repo_id|
                 source_repo_version = ::Katello::Repository.find(source_repo_id).version_href
                 config = { source_repo_version: source_repo_version, dest_repo: dest_repo_href, content: content_unit_hrefs }
@@ -203,9 +212,9 @@ module Katello
           filter_list_map
         end
 
-        def copy_content_from_mapping(repo_id_map, options = {})
+        def copy_content_from_mapping(repo_id_map, _options = {})
           repo_id_map.each do |source_repo_ids, dest_repo_map|
-            filters = ContentViewDebFilter.where(:id => options[:filter_ids])
+            filters = ContentViewDebFilter.where(:id => dest_repo_map[:filter_ids])
 
             filter_list_map = { whitelist_ids: [], blacklist_ids: [] }
             filter_list_map = add_filter_content(source_repo_ids, filters, filter_list_map)
@@ -218,7 +227,7 @@ module Katello
             dest_repo_map[:content_unit_hrefs] = content_unit_hrefs.uniq.sort
           end
 
-          dependency_solving = options[:solve_dependencies] || false
+          dependency_solving = false
 
           multi_copy_units(repo_id_map, dependency_solving)
         end
@@ -233,7 +242,8 @@ module Katello
               tasks << add_content(slice, first_slice)
               first_slice = false
             end
-          else
+          # If we're merging composite cv repositories, don't clear out the Pulp repository.
+          elsif remove_all
             tasks << remove_all_content
           end
           tasks

data/app/services/katello/registration_manager.rb

@@ -148,7 +148,7 @@ module Katello
         end
       end
 
-      def register_host(host, consumer_params, content_view_environments, activation_keys = []) # rubocop:disable Metrics/MethodLength
+      def register_host(host, consumer_params, content_view_environments, activation_keys = [])
         new_host = host.new_record?
         unless new_host
           host.save!
@@ -172,7 +172,6 @@ module Katello
         host.content_facet.cves_changed = false # prevent backend_update_needed from triggering an update on a nonexistent consumer
         host.subscription_facet = populate_subscription_facet(host, activation_keys, consumer_params, host_uuid)
         host.save! # the host has content and subscription facets at this point
-        create_initial_subscription_status(host)
 
         User.as_anonymous_admin do
           begin
@@ -219,10 +218,6 @@ module Katello
         destroy_host_record(host.id)
       end
 
-      def create_initial_subscription_status(host)
-        host.subscription_facet.update_subscription_status(::Katello::SubscriptionStatus::UNKNOWN)
-      end
-
       def create_in_candlepin(host, content_view_environments, consumer_params, activation_keys)
         # if CP fails, nothing to clean up yet w.r.t. backend services
         cp_create = ::Katello::Resources::Candlepin::Consumer.create(content_view_environments.map(&:cp_id), consumer_params, activation_keys.map(&:cp_name), host.organization)
@@ -243,7 +238,6 @@ module Katello
         host.subscription_facet.save!
         host.refresh_statuses([
                                 ::Katello::ErrataStatus,
-                                ::Katello::SubscriptionStatus,
                                 ::Katello::RhelLifecycleStatus
                               ])
       end
@@ -314,12 +308,6 @@ module Katello
         end
 
         host.get_status(::Katello::ErrataStatus).destroy
-        host.get_status(::Katello::PurposeSlaStatus).destroy
-        host.get_status(::Katello::PurposeRoleStatus).destroy
-        host.get_status(::Katello::PurposeUsageStatus).destroy
-        host.get_status(::Katello::PurposeAddonsStatus).destroy
-        host.get_status(::Katello::PurposeStatus).destroy
-        host.get_status(::Katello::SubscriptionStatus).destroy
         host.get_status(::Katello::TraceStatus).destroy
         host.installed_packages.delete_all
 

data/app/views/katello/api/v2/host_debs/base.json.rabl

@@ -2,3 +2,5 @@ object @resource
 
 attributes :id, :name
 attributes :version, :architecture
+attributes :upgradable_versions
+attributes :deb_id

data/app/views/katello/api/v2/hosts/base.json.rabl

@@ -4,6 +4,15 @@ object @resource
 @facet = @resource.content_facet
 
 attributes :id, :name, :description
+
+node :operatingsystem_family do |resource|
+  resource.operatingsystem.family
+end
+
+node :operatingsystem_major do |resource|
+  resource.operatingsystem.major
+end
+
 if @facet
   node :content_view do
     content_view = @facet&.single_content_view

data/app/views/katello/api/v2/subscription_facet/base_with_root.json.rabl

@@ -1,6 +1,3 @@
 child :subscription_facet => :subscription_facet_attributes do
   extends 'katello/api/v2/subscription_facet/base'
 end
-
-attributes :subscription_status, :subscription_status_label, :subscription_global_status,
-           :if => @object.get_status(Katello::SubscriptionStatus).relevant?

data/app/views/katello/api/v2/subscription_facet/show.json.rabl

@@ -7,6 +7,9 @@ child :subscription_facet => :subscription_facet_attributes do |_facet|
 
   child :hypervisor_host => :virtual_host do
     attributes :id, :name
+    node :display_name do |host|
+      host.to_label
+    end
   end
 
   child :virtual_guests => :virtual_guests do

data/app/views/katello/sync_management/index.html.erb

@@ -1,17 +1,18 @@
-<%= javascript 'katello/sync_management' %>
+<% content_for(:katello_javascripts) do -%>
+  <%= javascript_include_tag 'katello/sync_management' %>
+  <script>
+    localize({
+      "cancel": "<%= escape_javascript(_('Cancel')) %>",
+      "cancelled": "<%= escape_javascript(_('Sync Canceled')) %>",
+      "error": "<%= escape_javascript(_('Error')) %>",
+      "complete": "<%= escape_javascript(_('Sync complete.')) %>",
+      "no_start_time": "<%= escape_javascript(_('No start time currently available.')) %>"
+    });
 
-<%= javascript do %>
-  localize({
-    "cancel": "<%= escape_javascript(_('Cancel')) %>",
-    "cancelled": "<%= escape_javascript(_('Sync Canceled')) %>",
-    "error": "<%= escape_javascript(_('Error')) %>",
-    "complete": "<%= escape_javascript(_('Sync complete.')) %>",
-    "no_start_time": "<%= escape_javascript(_('No start time currently available.')) %>"
-  });
-
-    KT.repo_status = $.parseJSON('<%= escape_javascript(@repo_status.to_json.html_safe) %>');
-    KT.permissions = { "syncable" : <%= any_syncable? %> };
-<% end %>
+      KT.repo_status = $.parseJSON('<%= escape_javascript(@repo_status.to_json.html_safe) %>');
+      KT.permissions = { "syncable" : <%= any_syncable? %> };
+  </script>
+<% end -%>
 
 <% if Organization.current -%>
     <%= hidden_field_tag :organization_id, Organization.current.id%>

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -29,23 +29,27 @@ end %>
 <% env_select_name =  using_hostgroups_page? ? 'hostgroup[lifecycle_environment_id]' : 'host[content_facet_attributes][lifecycle_environment_id]' %>
 <% env_select_attr = using_hostgroups_page? ? 'lifecycle_environment' : 'content_facet.single_lifecycle_environment' %>
 
-<%= field(f, env_select_attr, {:label => _("Lifecycle Environment")}) do
-  if using_hostgroups_page?
-    select_tag env_select_id, lifecycle_environment_options(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)),
-               :class => 'form-control',  :name => env_select_name
-  else
-    select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name, :disabled =>  cv_lce_disabled?
-  end
-end %>
+<%= field(f, env_select_attr, {:label => _("Lifecycle Environment")}) do %>
+  <% if using_hostgroups_page? %>
+    <%= select_tag env_select_id, lifecycle_environment_options(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name %>
+  <% elsif cv_lce_disabled? %>
+    <%= hidden_field_tag 'host[content_facet_attributes][lifecycle_environment_id]', fetch_lifecycle_environment(@host).try(:id) %>
+    <%= select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name, :disabled => true %>
+  <% else %>
+    <%= select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name %>
+  <% end %>
+<% end %>
 
 <% cv_select_id =  using_hostgroups_page? ? :hostgroup_content_view_id : :host_content_view_id %>
 <% cv_select_name =  using_hostgroups_page? ? 'hostgroup[content_view_id]' : 'host[content_facet_attributes][content_view_id]' %>
 <% cv_select_attr = using_hostgroups_page? ? 'content_view' : 'content_facet.single_content_view' %>
-<%= field(f, cv_select_attr, {:label => _("Content View")}) do
-  if using_hostgroups_page?
-    select_tag cv_select_id,  content_views_for_host(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path},
-               :class => 'form-control',  :name => cv_select_name
-  else
-    select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name, :disabled =>  cv_lce_disabled?
-  end
-end %>
+<%= field(f, cv_select_attr, {:label => _("Content View")}) do %>
+  <% if using_hostgroups_page? %>
+    <%= select_tag cv_select_id,  content_views_for_host(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name %>
+  <% elsif cv_lce_disabled? %>
+    <%= hidden_field_tag 'host[content_facet_attributes][content_view_id]', fetch_content_view(@host).try(:id) %>
+    <%= select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name, :disabled =>  true %>
+  <% else %>
+    <%= select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name %>
+  <% end %>
+<% end %>

data/app/views/overrides/activation_keys/_host_synced_content_select.html.erb

@@ -23,7 +23,9 @@
              :class => 'form-control',  :name => ks_repo_select_name, :disabled => kickstart_options.empty?
 end %>
 
-<script>
-  KT.hosts.set_media_selection_bindings();
-  KT.hosts.update_media_enablement();
-</script>
+<% content_for(:javascripts) do -%>
+  <script>
+    KT.hosts.set_media_selection_bindings();
+    KT.hosts.update_media_enablement();
+  </script>
+<% end -%>