katello 3.5.0.rc2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19f6ac9b45e23cc6121072ab218c177f2ce4046c
-  data.tar.gz: 3b31f09c6475ee12c5b85320c1d0f9fca3ade74d
+  metadata.gz: f7792cb8398a9e19e7c8fae76fb5b0fe9ca4c626
+  data.tar.gz: fb99940f9ef3827a47fbd91acff229bff0ef5c31
 SHA512:
-  metadata.gz: 49d401266bc295ce1885ab5e8bfb6df86cabc5087146416bc683d2126ba1420875e6e360360893457d6860808fa2a82f9af70d2254cd60f42efe9ecafc892cd4
-  data.tar.gz: 07518a4b60a7117efd0198fbd0b7eb69bd851547b57d8547d36d681ed273e79be5ced13d0972df8d6aabeb4ebc3d23e035761ad4169018af7f2c6c038ad30036
+  metadata.gz: 2ebf367c04a9891233895191a5f219fa0613c41f2811d5b7acf67448101be0dfe279d5e8bb909b4df0ce83dbc6fa9d3d9f3b13f8f87e31038a428c43825d30e9
+  data.tar.gz: 1c9635966cd20a750531bf3b372e787e457b98c05c8fc7b8a79d04a7456b3c9efcaa7e525a2a4bb5c7e61de938eb243327a03cb9b4c39f6a26719470059f4b4d

data/app/assets/javascripts/katello/containers/container.js

@@ -1,6 +1,7 @@
 var KT = KT ? KT : {};
 
 KT.container = (function(){
+    var pre_selection = {};
     var setup = function() {
         var orgDropdown = $('#organization_id'),
             envDropdown = $('#kt_environment_id'),
@@ -136,6 +137,7 @@ KT.container = (function(){
                                     $('<option></option>').val(cv["id"]).html(cv["name"]));
                             });
                             enableContentViews(true);
+                            contentViewDropdown.val(pre_selection.content_view_id).trigger('change')
                         } else {
                             noCV.removeClass("hide");
                         }
@@ -173,6 +175,7 @@ KT.container = (function(){
                                     $('<option></option>').val(repo["id"]).html(repo["name"]));
                             });
                             enableRepositories(true);
+                            reposDropdown.val(pre_selection.repository_id).trigger('change');
                         } else {
                             noRepos.removeClass("hide");
                         }
@@ -204,6 +207,7 @@ KT.container = (function(){
                                 $('<option></option>').val(tag["id"]).html(tag["name"]));
                         });
                         enableTags(true);
+                        tagsDropdown.val(pre_selection.tag_id).trigger('change')
                 })
                 .fail(function(resp) {
                     $("#error_tags").removeClass("hide")
@@ -278,9 +282,14 @@ KT.container = (function(){
             spinner.addClass("hide")
         }
     };
-
+    setSelection = function(selection) {
+      pre_selection = selection;
+      $('#kt_environment_id').val(selection.environment_id)
+                             .trigger('change')
+    }
     return {
         setup: setup,
+        setSelection: setSelection,
         enableNext: enableNext
     };
 })();

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -119,7 +119,7 @@ KT.hosts.getSelectedEnvironment = function () {
 
 KT.hosts.onKatelloHostEditLoad = function(){
     var prefxies = ['host', 'hostgroup'],
-        attributes = ['lifecycle_environment_id', 'content_view_id', 'environment_id', 'content_source_id', 'architecture_id'];
+        attributes = ['lifecycle_environment_id', 'content_view_id', 'environment_id', 'architecture_id'];
 
     $.each(prefxies, function(index, prefix) {
         $.each(attributes, function(attrIndex, attribute) {
@@ -128,6 +128,10 @@ KT.hosts.onKatelloHostEditLoad = function(){
             });
         });
     });
+
+    $('body').on('change', '#content_source_id', function () {
+        KT.hosts.toggle_installation_medium();
+    });
 };
 
 KT.hosts.toggle_installation_medium = function() {
@@ -136,13 +140,13 @@ KT.hosts.toggle_installation_medium = function() {
     if ($('#hostgroup_parent_id').length > 0) {
       lifecycle_environment_id = KT.hosts.getSelectedEnvironment();
       content_view_id = KT.hosts.getSelectedContentView();
-      content_source_id = $('#hostgroup_content_source_id').val();
+      content_source_id = $('#content_source_id').val();
       architecture_id = $('#hostgroup_architecture_id').val();
       operatingsystem_id = $('#hostgroup_operatingsystem_id').val();
     } else {
       lifecycle_environment_id = KT.hosts.getSelectedEnvironment();
       content_view_id = KT.hosts.getSelectedContentView();
-      content_source_id = $('#host_content_source_id').val();
+      content_source_id = $('#content_source_id').val();
       architecture_id = $('#host_architecture_id').val();
       operatingsystem_id = $('#host_operatingsystem_id').val();
     }

data/app/controllers/katello/api/v2/api_controller.rb

@@ -57,6 +57,16 @@ module Katello
       includes = options.fetch(:includes, [])
       group = options.fetch(:group, nil)
 
+      if params[:order]
+        (params[:sort_by], params[:sort_order]) = params[:order].split(' ')
+      end
+
+      sort_attr = (params[:sort_by] || default_sort_by).to_s.downcase
+
+      if sort_attr.present? && !resource.column_names.include?(sort_attr)
+        fail ScopedSearch::QueryNotSupported, _("the field (%s) in the order statement is not valid field for search") % sort_attr
+      end
+
       total = scoped_search_total(query, group)
 
       unless empty_search_query?
@@ -67,13 +77,7 @@ module Katello
       query = query.select(group).group(group) if group
       sub_total = total.zero? ? 0 : scoped_search_total(query, group)
 
-      if params[:order]
-        (params[:sort_by], params[:sort_order]) = params[:order].split(' ')
-      end
-
-      sort_attr = params[:sort_by] || default_sort_by
-
-      if sort_attr
+      if sort_attr.present?
         sort_order = (params[:sort_order] || default_sort_order).to_s.downcase
         sort_order = default_sort_order unless ['desc', 'asc'].include?(sort_order)
         query = query.order(sort_attr => sort_order.to_sym)

data/app/controllers/katello/api/v2/host_collections_controller.rb

@@ -27,7 +27,7 @@ module Katello
     api :GET, "/organizations/:organization_id/host_collections", N_("List host collections within an organization")
     api :GET, "/activation_keys/:activation_key_id/host_collections", N_("List host collections in an activation key")
     param_group :search, Api::V2::ApiController
-    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
+    param :organization_id, :number, :desc => N_("organization identifier")
     param :name, String, :desc => N_("host collection name to filter by")
     param :activation_key_id, :identifier, :desc => N_("activation key identifier")
     param :host_id, :number, :desc => N_("Filter products by host id")

data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb

@@ -202,7 +202,7 @@ module Katello
           _("Puppet Module")
         when "Katello::DockerManifest"
           _("Docker Manifest")
-        when "Katello::DockerTag"
+        when "Katello::DockerMetaTag"
           _("Docker Tag")
         when "Katello::OstreeBranch"
           _("OSTree Branch")

data/app/controllers/katello/concerns/containers/steps_controller_extensions.rb

@@ -26,15 +26,23 @@ module Katello
             end
 
             if params[:tag] && params[:tag][:id]
-              tag = DockerTag.where(:id => params[:tag][:id]).first
+              tag = DockerMetaTag.where(:id => params[:tag][:id]).first
             end
             if params[:capsule] && params[:capsule][:id]
               capsule_id = params[:capsule][:id]
             end
-            @docker_container_wizard_states_image = @state.build_image(:repository_name => repo.try(:pulp_id),
+
+            katello_content = {
+              organization_id: params[:organization_id],
+              environment_id: params.fetch(:kt_environment, {})[:id],
+              content_view_id: params.fetch(:content_view, {})[:id],
+              repository_id: repo.try(:id),
+              tag_id: tag.try(:id)
+            }
+            @docker_container_wizard_states_image = @state.build_image(:repository_name => repo.try(:container_repository_name),
                                 :tag => tag.try(:name),
                                 :capsule_id => capsule_id,
-                                :katello => true)
+                                :katello => true, :katello_content => katello_content)
           else
             build_state_without_katello
           end

data/app/lib/actions/katello/capsule_content/create_repos.rb

@@ -44,6 +44,7 @@ module Actions
                       path: relative_path,
                       with_importer: true,
                       docker_upstream_name: repository.docker? ? repository.container_repository_name : nil,
+                      repo_registry_id: repository.docker? ? repository.container_repository_name : nil,
                       download_policy: repository.capsule_download_policy(capsule_content.capsule),
                       capsule_id: capsule_content.capsule.id)
         end

data/app/lib/actions/katello/content_view/errata_mail.rb

@@ -14,7 +14,7 @@ module Actions
           users = ::User.select { |user| user.receives?(:promote_errata) && user.organization_ids.include?(content_view.organization_id) && user.can?(:view_content_views, content_view) }
 
           begin
-            MailNotification[:promote_errata].deliver_now(:users => users, :content_view => content_view, :environment => environment) unless users.blank?
+            MailNotification[:promote_errata].deliver(:users => users, :content_view => content_view, :environment => environment) unless users.blank?
           rescue => e
             message = _('Unable to send errata e-mail notification: %{error}' % {:error => e})
             Rails.logger.error(message)

data/app/lib/actions/katello/host/hypervisors_update.rb

@@ -45,8 +45,7 @@ module Actions
         end
 
         def create_host_for_hypervisor(name, organization, location = nil)
-          location ||= Location.unscoped.find_by_title(
-            Setting[:default_location_subscribed_hosts])
+          location ||= Location.default_host_subscribe_location!
           host = ::Host::Managed.new(:name => name, :organization => organization,
                                      :location => location, :managed => false, :enabled => false)
           host.save!

data/app/lib/actions/katello/host/update.rb

@@ -28,7 +28,7 @@ module Actions
         def run
           User.as_anonymous_admin do
             host = ::Host.find(input[:host_id])
-            unless input[:consumer_params][:facts].blank?
+            if input[:consumer_params].try(:[], :facts)
               ::Katello::Host::SubscriptionFacet.update_facts(host, input[:consumer_params][:facts])
             end
           end
@@ -40,7 +40,7 @@ module Actions
               host = ::Host.find(input[:host_id])
               host.subscription_facet.update_from_consumer_attributes(input[:consumer_params])
               host.subscription_facet.save!
-              input[:consumer_params][:facts] = 'TRIMMED' unless input[:consumer_params][:facts].blank?
+              input[:consumer_params][:facts] = 'TRIMMED' if input[:consumer_params].try(:[], :facts)
             end
           end
         end

data/app/lib/actions/katello/repository/errata_mail.rb

@@ -17,7 +17,7 @@ module Actions
           errata = ::Katello::Erratum.where(:id => repo.repository_errata.where('katello_repository_errata.updated_at > ?', input[:last_updated].to_datetime).pluck(:erratum_id))
 
           begin
-            MailNotification[:sync_errata].deliver_now(:users => users, :repo => repo, :errata => errata) unless (users.blank? || errata.blank?)
+            MailNotification[:sync_errata].deliver(:users => users, :repo => repo, :errata => errata) unless (users.blank? || errata.blank?)
           rescue => e
             message = _('Unable to send errata e-mail notification: %{error}' % {:error => e})
             Rails.logger.error(message)

data/app/lib/actions/pulp/repository/abstract_copy_content.rb

@@ -21,7 +21,7 @@ module Actions
           optional[:override_config] = input[:override_config] if input[:override_config]
           content_extension.copy(input[:source_pulp_id],
                                  input[:target_pulp_id],
-                                 criteria)
+                                 optional)
         end
 
         def criteria

data/app/lib/katello/resources/candlepin.rb

@@ -90,6 +90,21 @@ module Katello
         def self.included_list(included)
           included.map { |value| "include=#{value}" }.join('&')
         end
+
+        def self.fetch_paged(page_size = -1)
+          if page_size == -1
+            page_size = SETTINGS[:katello][:candlepin][:bulk_load_size]
+          end
+          page = 0
+          content = []
+          loop do
+            page += 1
+            data = yield("per_page=#{page_size}&page=#{page}")
+            content.concat(data)
+            break if data.size < page_size
+          end
+          content
+        end
       end
 
       class CandlepinPing < CandlepinResource
@@ -112,12 +127,23 @@ module Katello
             "/candlepin/consumers/#{id}"
           end
 
+          def all_uuids
+            cp_consumers = Organization.all.map do |org|
+              ::Katello::Resources::Candlepin::Consumer.get('owner' => org.label, :include_only => [:uuid])
+            end
+            cp_consumers.flatten!
+            cp_consumers.map { |consumer| consumer["uuid"] }
+          end
+
           def get(params)
             if params.is_a?(String)
               JSON.parse(super(path(params), self.default_headers).body).with_indifferent_access
             else
-              response = super(path + hash_to_query(params), self.default_headers).body
-              JSON.parse(response)
+              includes = params.key?(:include_only) ? "&" + included_list(params.delete(:include_only)) : ""
+              fetch_paged do |page_add|
+                response = super(path + hash_to_query(params) + includes + "&#{page_add}", self.default_headers).body
+                JSON.parse(response)
+              end
             end
           end
 

data/app/models/katello/activation_key.rb

@@ -88,7 +88,7 @@ module Katello
       added_pools = self.pools.pluck(:cp_id)
       available_pools = all_pools - added_pools
       Pool.where(:cp_id => available_pools,
-                 :subscription_id => Subscription.with_subscribable_content)
+                 :subscription_id => Subscription.subscribable)
     end
 
     def products

data/app/models/katello/concerns/container_extensions.rb

@@ -12,7 +12,7 @@ module Katello
 
       def repository_pull_url_with_katello
         repo_url = repository_pull_url_without_katello
-        if Repository.where(:pulp_id => repository_name).count > 0
+        if Repository.where(:container_repository_name => repository_name).count > 0
           manifest_capsule = self.capsule || CapsuleContent.default_capsule.capsule
           "#{URI(manifest_capsule.url).hostname}:#{Setting['pulp_docker_registry_port']}/#{repo_url}"
         else

data/app/models/katello/concerns/docker_container_wizard_state_image_extensions.rb

@@ -0,0 +1,39 @@
+module Katello
+  module Concerns
+    module DockerContainerWizardStateImageExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :image_exists, :katello
+
+        serialize :katello_content, Hash
+        validate :katello_content_completed, :if => :katello?
+      end
+
+      def image_exists_with_katello
+        return true if katello?
+        image_exists_without_katello
+      end
+
+      def katello_content_completed
+        empty_values = katello_content.map do |key, value|
+          key if value.blank?
+        end
+        empty_values.compact!
+
+        return true if empty_values.empty?
+
+        message_mapping = {
+          organization_id: _("Organization not set"),
+          environment_id: _("Lifecycle Environment not set"),
+          content_view_id: _("Content View not set"),
+          repository_id: _("Repository not set"),
+          tag_id: _("Tag not set")
+        }
+        empty_values.each do |key|
+          errors.add(:katello_content, message_mapping[key])
+        end
+      end
+    end
+  end
+end

data/app/models/katello/concerns/environment_extensions.rb

@@ -38,7 +38,7 @@ module Katello
         def build_by_katello_id(org, env, content_view)
           env_name = Environment.construct_name(org, env, content_view)
           katello_id = Environment.construct_katello_id(org, env, content_view)
-          default_location_id = ::Location.find_by_title(::Setting[:default_location_puppet_content]).id
+          default_location_id = ::Location.default_puppet_content_location!.id
           environment = Environment.new(:name => env_name,
                                         :organization_ids => [org.id],
                                         :location_ids => [default_location_id])

data/app/models/katello/concerns/location_extensions.rb

@@ -5,6 +5,7 @@ module Katello
 
       included do
         after_initialize :set_default_overrides, :if => :new_record?
+        after_save :reset_settings
         before_destroy :deletable?
       end
 
@@ -13,6 +14,17 @@ module Katello
         self.ignore_types << ::Hostgroup.name
       end
 
+      def reset_settings
+        if self.title_changed?
+          if ::Setting[:default_location_subscribed_hosts] == self.title_was
+            ::Setting[:default_location_subscribed_hosts] = self.title
+          end
+          if ::Setting[:default_location_puppet_content] == self.title_was
+            ::Setting[:default_location_puppet_content] = self.title
+          end
+        end
+      end
+
       def deletable?
         if ::Location.unscoped.count == 1
           errors.add(
@@ -43,15 +55,28 @@ module Katello
       end
 
       module ClassMethods
+        def default_puppet_content_location
+          ::Location.unscoped.find_by_title(::Setting[:default_location_puppet_content]) if ::Setting[:default_location_puppet_content].present?
+        end
+
+        def default_puppet_content_location!
+          location = default_puppet_content_location
+          fail _("Setting 'default_location_puppet_content' is not set to a valid location.") if location.nil?
+          location
+        end
+
+        def default_host_subscribe_location
+          ::Location.unscoped.find_by_title(::Setting[:default_location_subscribed_hosts]) if ::Setting[:default_location_subscribed_hosts].present?
+        end
+
+        def default_host_subscribe_location!
+          location = default_host_subscribe_location
+          fail _("Setting 'default_location_subscribed_hosts' is not set to a valid location.") if location.nil?
+          location
+        end
+
         def default_location_ids
-          ids = []
-          if ::Setting[:default_location_puppet_content].present?
-            ids << ::Location.find_by_title(::Setting[:default_location_puppet_content]).id
-          end
-          if ::Setting[:default_location_subscribed_hosts].present?
-            ids << ::Location.find_by_title(::Setting[:default_location_subscribed_hosts]).id
-          end
-          ids.uniq
+          [default_host_subscribe_location, default_puppet_content_location].compact.map(&:id).uniq
         end
       end
     end

data/app/models/katello/content_view_puppet_environment.rb

@@ -38,6 +38,10 @@ module Katello
       false
     end
 
+    def mirror_on_sync?
+      true
+    end
+
     def node_syncable?
       environment
     end

data/app/models/katello/docker_manifest.rb

@@ -9,6 +9,8 @@ module Katello
     CONTENT_TYPE = Pulp::DockerManifest::CONTENT_TYPE
     scoped_search :on => :name, :complete_value => true
     scoped_search :relation => :docker_tags, :on => :name, :rename => :tag, :complete_value => true, :only_explicit => true
+    scoped_search :on => :digest, :rename => :digest, :complete_value => true, :only_explicit => true
+    scoped_search :on => :schema_version, :rename => :schema_version, :complete_value => true, :only_explicit => true
 
     def self.repository_association_class
       RepositoryDockerManifest

data/app/models/katello/docker_meta_tag.rb

@@ -9,6 +9,31 @@ module Katello
     belongs_to :schema2, :class_name => "Katello::DockerTag",
                           :inverse_of => :schema2_meta_tag
 
+    scoped_search :on => :name, :complete_value => true, :rename => :tag
+    scoped_search :on => :schema_version, :rename => :schema_version, :complete_value => { "1" => "1", "2" => "2"},
+                  :only_explicit => true, :ext_method => :find_by_schema_version, :operators => ["="]
+    scoped_search :relation => :repository, :on => :name, :rename => :repository,
+      :complete_value => true, :only_explicit => true
+
+    def self.find_by_schema_version(_key, operator, value)
+      conditions = ""
+      if operator == '='
+        if ["1", "2"].include?(value)
+          column = if value == "1"
+                     "schema1_id"
+                   else
+                     "schema2_id"
+                   end
+          docker_meta_tag_arel_table = ::Katello::DockerMetaTag.arel_table
+          conditions = docker_meta_tag_arel_table[column].not_eq(nil).to_sql
+        else
+          #failure condition. No such value so must return 0
+          conditions = "1=0"
+        end
+      end
+      { :conditions => conditions }
+    end
+
     def self.delegate_to_tags(*names)
       names.each do |name|
         define_method(name) do
@@ -28,6 +53,10 @@ module Katello
       [self.repository]
     end
 
+    def related_tags
+      self.class.where(:repository_id => repository.group, :name => name)
+    end
+
     def self.in_repositories(repos, grouped = false)
       if grouped
         search_in_tags(DockerTag.in_repositories(repos).grouped)
@@ -49,6 +78,10 @@ module Katello
       schema2.try(:docker_manifest)
     end
 
+    def self.with_uuid(ids)
+      self.with_identifiers(ids)
+    end
+
     def self.with_identifiers(ids)
       self.where(:id => ids)
     end

data/app/models/katello/docker_tag.rb

@@ -11,20 +11,20 @@ module Katello
     has_one :schema2_meta_tag, :class_name => "Katello::DockerMetaTag", :foreign_key => "schema2_id",
                                :inverse_of => :schema2, :dependent => :nullify
 
-    scoped_search :on => :name, :complete_value => true, :rename => :tag
-    scoped_search :relation => :docker_manifest, :on => :name, :rename => :manifest,
-      :complete_value => true, :only_explicit => false
-    scoped_search :relation => :docker_manifest, :on => :digest, :rename => :digest,
-      :complete_value => false, :only_explicit => true
-    scoped_search :relation => :docker_manifest, :on => :schema_version, :rename => :schema_version,
-      :complete_value => false, :only_explicit => true
-    scoped_search :relation => :repository, :on => :name, :rename => :repository,
-      :complete_value => true, :only_explicit => true
+    before_destroy :cleanup_meta_tags
 
     scope :in_repositories, ->(repos) { where(:repository_id => repos) }
 
     delegate :relative_path, :environment, :content_view_version, :product, :to => :repository
 
+    def associated_meta_tag
+      schema1_meta_tag || schema2_meta_tag
+    end
+
+    def associated_meta_tag_identifier
+      associated_meta_tag.id
+    end
+
     def self.grouped
       grouped_fields = "#{table_name}.name, #{Repository.table_name}.name, #{Product.table_name}.name"
       ids = uniq.select("ON (#{grouped_fields}) #{table_name}.id").joins(:repository => :product)
@@ -73,5 +73,15 @@ module Katello
     def self.completer_scope_options
       {"#{Katello::Repository.table_name}" => lambda { |repo_class| repo_class.docker_type } }
     end
+
+    def cleanup_meta_tags
+      if schema1_meta_tag && schema1_meta_tag.schema2.blank?
+        schema1_meta_tag.destroy
+      end
+
+      if schema2_meta_tag && schema2_meta_tag.schema1.blank?
+        schema2_meta_tag.destroy
+      end
+    end
   end
 end

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

@@ -146,13 +146,11 @@ module Katello
 
       def self.find_or_create_host(organization, rhsm_params)
         host = find_host(rhsm_params[:facts], organization)
-        unless host
-          host = Katello::Host::SubscriptionFacet.new_host_from_facts(
-            rhsm_params[:facts],
-            organization,
-            Location.unscoped.find_by_title(::Setting[:default_location_subscribed_hosts])
-          )
-        end
+        host ||= Katello::Host::SubscriptionFacet.new_host_from_facts(
+          rhsm_params[:facts],
+          organization,
+          Location.default_host_subscribe_location!
+        )
         host.organization = organization unless host.organization
         host
       end

data/app/models/katello/product.rb

@@ -55,10 +55,10 @@ module Katello
     scope :redhat, -> { joins(:provider).where("#{Provider.table_name}.provider_type" => Provider::REDHAT) }
     scope :custom, -> { joins(:provider).where("#{Provider.table_name}.provider_type" => [Provider::CUSTOM, Provider::ANONYMOUS]) }
 
-    def self.with_subscribable_content
-      joins(:repositories).uniq.
-        where("#{Katello::Repository.table_name}.content_type IN (?)",
-              Repository::SUBSCRIBABLE_TYPES)
+    def self.subscribable
+      joins("LEFT OUTER JOIN #{Katello::Repository.table_name} repo ON repo.product_id = #{self.table_name}.id")
+        .where("repo.content_type IN (?) OR repo IS NULL", Repository::SUBSCRIBABLE_TYPES)
+        .group("#{self.table_name}.id, repo.product_id")
     end
 
     def self.enabled

data/app/models/katello/subscription.rb

@@ -12,9 +12,10 @@ module Katello
 
     scope :in_organization, ->(org) { where(:organization => org) }
 
-    def self.with_subscribable_content
-      joins(:products).
-        where("#{Katello::Product.table_name}.id" => Product.with_subscribable_content)
+    def self.subscribable
+      joins("LEFT OUTER JOIN #{Katello::SubscriptionProduct.table_name} subprod ON #{self.table_name}.id = subprod.subscription_id")
+        .where("subprod.product_id" => Product.subscribable << nil)
+        .group("#{self.table_name}.id")
     end
 
     def self.using_virt_who

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

@@ -122,20 +122,6 @@ module Katello
         end
       end
 
-      def self.orphaned_consumer_ids
-        #returns consumer ids in candlepin with no matching katello entry
-        orphaned_ids = []
-        User.as_anonymous_admin do
-          cp_consumers = Organization.all.collect { |org| ::Katello::Resources::Candlepin::Consumer.get('owner' => org.label) }
-          cp_consumers.flatten!
-          cp_consumers.reject! { |consumer| consumer['type']['label'] == 'uebercert' }
-          cp_consumer_ids = cp_consumers.map { |consumer| consumer["uuid"] }
-          katello_consumer_ids = ::Katello::Host::SubscriptionFacet.pluck(:uuid)
-          orphaned_ids = cp_consumer_ids - katello_consumer_ids
-        end
-        orphaned_ids
-      end
-
       def self.distribution_to_puppet_os(name)
         return ::Operatingsystem::REDHAT_ATOMIC_HOST_OS if name == ::Operatingsystem::REDHAT_ATOMIC_HOST_DISTRO_NAME
 

data/app/services/katello/pulp/erratum.rb

@@ -1,7 +1,7 @@
 module Katello
   module Pulp
     class Erratum < PulpContentUnit
-      PULP_SELECT_FIELDS = %w(id).freeze
+      PULP_SELECT_FIELDS = %w(errata_id).freeze
       CONTENT_TYPE = "erratum".freeze
 
       def self.unit_handler

data/app/views/dashboard/_content_views_widget.html.erb

@@ -21,7 +21,7 @@
       <% histories.each do |history| %>
         <tr>
           <td class='ellipsis'>
-            <a href="/content_views/<%= history.content_view_version.content_view.id %>/versions/<%= history.content_view_version.id %>/details">
+            <a href="/content_views/<%= history.content_view_version.content_view.id %>/versions/<%= history.content_view_version.id %>">
               <%= history.content_view_version.content_view.name %> <%= history.content_view_version.version %>
             </a>
           </td>