katello 3.0.0.rc2 → 3.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6829678768affb483093b13a2110018c840afa8
-  data.tar.gz: 1fc206b7a87207c04f93769ff55dce2f4ade0728
+  metadata.gz: bcf466b607593accd6ccc627041d411c26cc1139
+  data.tar.gz: abdebb1a909e6c2c51d0dade21571f0342e8eb8c
 SHA512:
-  metadata.gz: bb875205693ff0f2cdc55a4fd06dedf91ebb571f70a33e44c69655b1d08c365630efe93a0d0b491372d2f84462a0e946f832eebf23a7eb54c2fb047e27730ff9
-  data.tar.gz: 7a5a4f83be8c4d6c8f81d44ea9bcc4fae3820ad37e3059d2a5e15f108ecfdde6783cfa20f9557df674ab8addc62ad10362fbef721f9740424cf5a0c12e92852f
+  metadata.gz: b44891c5cff52cb9f94c585e752d9a5d45687cdd9078b33bd24d8ff760e74a75dc212af47cbd35cb820e2c8d46a6eea4d1370a07683411e4a615fc99667651fb
+  data.tar.gz: 93876b0c4423e0ebf63506433bf91c1b6e4ba50e54705b083a4be0b5d83a34a4917854bfde1e4d0ae3c8c47b0cd75954a60f266642b5d7e23fb77e3176fe4cfb

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

@@ -108,7 +108,8 @@ module Katello
       end
     end
     def incremental_update
-      if params[:add_content] && params[:add_content].key?(:errata_ids) && params[:update_hosts]
+      any_environments = params[:content_view_version_environments].any? { |cvve| cvve[:environment_ids].try(:any?) }
+      if params[:add_content] && params[:add_content].key?(:errata_ids) && params[:update_hosts] && any_environments
         hosts = calculate_hosts_for_incremental(params[:update_hosts], params[:propagate_to_composites])
       else
         hosts = []
@@ -126,9 +127,13 @@ module Katello
       if bulk_params[:included].try(:[], :search)
         version_environments  = find_version_environments_for_hosts(use_composites)
         restrict_hosts = lambda do |relation|
-          errata = Erratum.with_identifiers(params[:add_content][:errata_ids])
-          content_facets = Host::ContentFacet.in_content_view_version_environments(version_environments).with_applicable_errata(errata)
-          relation.where(:id => content_facets.pluck(:host_id))
+          if version_environments.any?
+            errata = Erratum.with_identifiers(params[:add_content][:errata_ids])
+            content_facets = Host::ContentFacet.in_content_view_version_environments(version_environments).with_applicable_errata(errata)
+            relation.where(:id => content_facets.pluck(:host_id))
+          else
+            relation.where("1=0")
+          end
         end
       else
         restrict_hosts = nil
@@ -171,8 +176,10 @@ module Katello
           return deny_access(_("You are not allowed to promote to Environments %s") % un_promotable.map(&:name).join(', '))
         end
 
-        not_found = combination[:environment_ids].map(&:to_s) - version_environment[:environments].map { |env| env.id.to_s }
-        fail _("Could not find Environment with ids: %s") % not_found.join(', ') unless not_found.empty?
+        unless combination[:environment_ids].blank?
+          not_found = combination[:environment_ids].map(&:to_s) - version_environment[:environments].map { |env| env.id.to_s }
+          fail _("Could not find Environment with ids: %s") % not_found.join(', ') unless not_found.empty?
+        end
 
         if view.composite?
           @composite_version_environments << version_environment
@@ -202,9 +209,10 @@ module Katello
                                                                             :environments => composite_version.environments}
           end
         end
+
         version_environments_for_systems_map.values
       else
-        @version_environments
+        @version_environments.select { |ve| !ve[:environment_ids].blank? }
       end
     end
 

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

@@ -3,7 +3,7 @@ module Katello
     include Katello::Concerns::FilteredAutoCompleteSearch
     respond_to :json
 
-    wrap_parameters :include => (System.attribute_names + %w(type autoheal facts guest_ids host_collection_ids installed_products content_view environment))
+    wrap_parameters :include => (System.attribute_names + %w(type autoheal facts guest_ids host_collection_ids installed_products content_view environment service_level release_ver last_checkin))
 
     skip_before_filter :set_default_response_format, :only => :report
 

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

@@ -24,7 +24,7 @@ module Actions
                       content_type: repository.content_type,
                       pulp_id: repository.pulp_id,
                       name: repository.name,
-                      feed: repository.full_path,
+                      feed: repository.docker? ? repository.docker_feed_url(true) : repository.full_path,
                       ssl_ca_cert: ::Cert::Certs.ca_cert,
                       ssl_client_cert: ueber_cert[:cert],
                       ssl_client_key: ueber_cert[:key],

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

@@ -20,13 +20,13 @@ module Actions
           fail _("Action not allowed for the default capsule.") if capsule_content.default_capsule?
 
           need_updates = repos_needing_updates(capsule_content, environment, content_view)
-          need_updates.each do |repo|
-            plan_action(Pulp::Repository::Refresh, repo, capsule_id: capsule_content.capsule.id)
-          end
-
           repository_ids = get_repository_ids(capsule_content, environment, content_view, repository)
           unless repository_ids.blank?
             sequence do
+              need_updates.each do |repo|
+                plan_action(Pulp::Repository::Refresh, repo, capsule_id: capsule_content.capsule.id)
+              end
+
               plan_action(ConfigureCapsule, capsule_content, environment, content_view)
 
               smart_proxy = SmartProxy.where(:content_host_id => capsule_content.consumer.id).first

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -108,7 +108,7 @@ module Actions
         # given a composite version, and a list of new components, calculate the list of all components for the new version
         def calculate_components(old_version, new_components)
           old_components = old_version.components.select do |component|
-            !old_version.components.map(&:content_view_id).include?(component.content_view_id)
+            !new_components.map(&:content_view_id).include?(component.content_view_id)
           end
           old_components + new_components
         end

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

@@ -46,15 +46,17 @@ module Actions
 
             concurrence do
               plan_action(::Actions::Pulp::Repos::Update, repository.product) if repository.product.sync_plan
-              plan_self(:repository_id => repository.id) unless repository.puppet?
+              plan_self(:repository_id => repository.id, :clone => clone)
             end
           end
         end
 
         def run
           ::User.current = ::User.anonymous_api_admin
-          repository = ::Katello::Repository.find(input[:repository_id])
-          ForemanTasks.async_task(Katello::Repository::MetadataGenerate, repository)
+          unless input[:clone]
+            repository = ::Katello::Repository.find(input[:repository_id])
+            ForemanTasks.async_task(Katello::Repository::MetadataGenerate, repository)
+          end
         ensure
           ::User.current = nil
         end

data/app/lib/actions/pulp/consumer/content_install.rb

@@ -28,7 +28,7 @@ module Actions
           output[:pulp_tasks].each do |pulp_task|
             error_details = pulp_task.try(:[], "result").try(:[], "details").try(:[], "rpm").try(:[], "details").try(:[], "trace")
             error_message = pulp_task.try(:[], "result").try(:[], "details").try(:[], "rpm").try(:[], "details").try(:[], "message")
-            if error_details.include?("YumDownloadError") && error_message
+            if error_details && error_details.include?("YumDownloadError") && error_message
               fail _("An error occurred during the sync \n%{error_message}") % {:error_message => error_details}
             end
           end

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

@@ -105,9 +105,10 @@ module Katello
           end
 
           def create(env_id, parameters, activation_key_cp_ids)
+            parameters['installedProducts'] ||= [] #if installed products is nil, candlepin won't attach custom products
             url = "/candlepin/environments/#{url_encode(env_id)}/consumers/"
-
             url += "?activation_keys=" + activation_key_cp_ids.join(",") if activation_key_cp_ids.length > 0
+
             response = self.post(url, parameters.to_json, self.default_headers).body
             JSON.parse(response).with_indifferent_access
           end

data/app/models/katello/activation_key.rb

@@ -52,10 +52,10 @@ module Katello
     scope :in_environment, ->(env) { where(:environment_id => env) }
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
     scoped_search :rename => :environment, :on => :name, :in => :environment, :complete_value => true
     scoped_search :rename => :content_view, :on => :name, :in => :content_view, :complete_value => true
-    scoped_search :on => :content_view_id, :complete_value => true
+    scoped_search :on => :content_view_id, :complete_value => true, :only_explicit => true
     scoped_search :on => :description, :complete_value => true
 
     def environment_exists

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

@@ -24,7 +24,7 @@ module Katello
         ids = [ids] unless ids.is_a?(Array)
         ids.map!(&:to_s)
         id_integers = ids.map { |string| Integer(string) rescue -1 }
-        where("#{self.table_name}.id = (?) or #{self.table_name}.uuid = (?)", id_integers, ids)
+        where("#{self.table_name}.id in (?) or #{self.table_name}.uuid in (?)", id_integers, ids)
       end
 
       def in_repositories(repos)

data/app/models/katello/content_view.rb

@@ -63,7 +63,7 @@ module Katello
     scope :non_composite, -> { where(:composite => [nil, false]) }
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
     scoped_search :on => :composite, :complete_value => {true: true, false: false}
 
     def self.in_environment(env)

data/app/models/katello/content_view_version.rb

@@ -42,7 +42,7 @@ module Katello
     scope :default_view, -> { joins(:content_view).where("#{Katello::ContentView.table_name}.default" => true) }
     scope :non_default_view, -> { joins(:content_view).where("#{Katello::ContentView.table_name}.default" => false) }
 
-    scoped_search :on => :content_view_id
+    scoped_search :on => :content_view_id, :only_explicit => true
     scoped_search :on => :major, :rename => :version, :complete_value => true, :ext_method => :find_by_version
     scoped_search :in => :repositories, :on => :name, :rename => :repository, :complete_value => true
 
@@ -256,6 +256,10 @@ module Katello
       PackageGroup.in_repositories(archived_repos).uniq
     end
 
+    def package_group_count
+      package_groups.count
+    end
+
     def check_ready_to_promote!(to_env)
       fail _("Default content view versions cannot be promoted") if default?
       content_view.check_composite_action_allowed!(to_env)

data/app/models/katello/erratum.rb

@@ -20,7 +20,7 @@ module Katello
     has_many :cves, :class_name => "Katello::ErratumCve", :dependent => :destroy, :inverse_of => :erratum
     has_many :packages, :class_name => "Katello::ErratumPackage", :dependent => :destroy, :inverse_of => :erratum
 
-    scoped_search :on => :errata_id, :rename => :id, :complete_value => true
+    scoped_search :on => :errata_id, :rename => :id, :complete_value => true, :only_explicit => true
     scoped_search :on => :title, :only_explicit => true
     scoped_search :on => :severity, :complete_value => true
     scoped_search :on => :errata_type, :rename => :type, :complete_value => true
@@ -58,7 +58,7 @@ module Katello
       ids = [ids] unless ids.is_a?(Array)
       ids.map!(&:to_s)
       id_integers = ids.map { |string| Integer(string) rescue -1 }
-      where("#{self.table_name}.id = (?) or #{self.table_name}.uuid = (?) or #{self.table_name}.errata_id = (?)", id_integers, ids, ids)
+      where("#{self.table_name}.id in (?) or #{self.table_name}.uuid in (?) or #{self.table_name}.errata_id in (?)", id_integers, ids, ids)
     end
 
     def hosts_applicable

data/app/models/katello/glue/candlepin/pool.rb

@@ -124,7 +124,7 @@ module Katello
       def create_activation_key_associations
         keys = Resources::Candlepin::ActivationKey.get(nil, "?include=id&include=pools.pool.id")
         activation_key_ids = keys.collect do |key|
-          key['id'] if key['pools'].any? { |pool| pool['pool']['id'] == cp_id }
+          key['id'] if key['pools'].present? && key['pools'].any? { |pool| pool['pool']['id'] == cp_id }
         end
         related_keys = ::Katello::ActivationKey.where(:cp_id => activation_key_ids.compact)
         related_keys.each do |key|

data/app/models/katello/gpg_key.rb

@@ -21,7 +21,7 @@ module Katello
     validates_with Validators::GpgKeyContentValidator, :attributes => :content, :if => proc { SETTINGS[:katello][:gpg_strict_validation] }
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
 
     def as_json(options = {})
       options ||= {}

data/app/models/katello/host_collection.rb

@@ -28,7 +28,7 @@ module Katello
     validate :max_hosts_not_exceeded, :on => :create
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
     scoped_search :in => :hosts, :complete_value => false
 
     def max_hosts_check

data/app/models/katello/kt_environment.rb

@@ -77,7 +77,7 @@ module Katello
     ERROR_CLASS_NAME = "Environment"
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
 
     def library?
       self.library

data/app/models/katello/pool.rb

@@ -16,7 +16,7 @@ module Katello
     include Glue::Candlepin::Pool
     include Glue::Candlepin::CandlepinObject
 
-    scoped_search :on => :cp_id, :complete_value => true, :rename => :id
+    scoped_search :on => :cp_id, :complete_value => true, :rename => :id, :only_explicit => true
     scoped_search :on => :quantity, :complete_value => true
     scoped_search :on => :start_date, :complete_value => true, :rename => :starts
     scoped_search :on => :end_date, :complete_value => true, :rename => :expires

data/app/models/katello/product.rb

@@ -29,7 +29,7 @@ module Katello
     validates_with Validators::ProductUniqueAttributeValidator, :attributes => :label
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
     scoped_search :on => :label, :complete_value => true
     scoped_search :on => :description
     scoped_search :in => :provider, :on => :provider_type, :rename => :redhat,

data/app/models/katello/sync_plan.rb

@@ -26,7 +26,7 @@ module Katello
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
     scoped_search :on => :interval, :complete_value => true
     scoped_search :on => :enabled, :complete_value => true
 

data/app/views/foreman/unattended/finish-katello.erb

@@ -35,7 +35,7 @@ echo "updating system time"
 /usr/sbin/ntpdate -sub <%= @host.params['ntp-server'] || '0.fedora.pool.ntp.org' %>
 /usr/sbin/hwclock --systohc
 
-<% if @host.respond_to?(:realm) && @host.otp && @host.realm && @host.realm.realm_type == "FreeIPA" -%>
+<% if @host.info['parameters']['realm'] && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
 <%= snippet "freeipa_register" %>
 <% end -%>
 

data/app/views/foreman/unattended/kickstart-katello.erb

@@ -104,7 +104,7 @@ echo "updating system time"
 
 <%= snippet "subscription_manager_registration" %>
 
-<% if @host.respond_to?(:realm) && @host.otp && @host.realm && @host.realm.realm_type == "FreeIPA" -%>
+<% if @host.info['parameters']['realm'] && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
 <%= snippet "freeipa_register" %>
 <% end -%>
 

data/app/views/foreman/unattended/userdata-katello.erb

@@ -29,7 +29,7 @@ write_files:
 <%= indent 4 do
       snippet 'subscription_manager_registration'
     end %>
-<% if @host.respond_to?(:realm) && @host.otp && @host.realm && @host.realm.realm_type == "FreeIPA" -%>
+<% if @host.info['parameters']['realm'] && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
 <%= indent 4 do
       snippet 'freeipa_register'
     end %>

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

@@ -1,3 +1,3 @@
-child :content_facet => :content do |_content_facet|
+child :content_facet => :content_facet_attributes do |_content_facet|
   extends 'katello/api/v2/content_facet/base'
 end

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

@@ -1,4 +1,4 @@
-child :content_facet => :content do
+child :content_facet => :content_facet_attributes do
   extends 'katello/api/v2/content_facet/base'
 
   node do |content_facet|

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

@@ -9,6 +9,7 @@ attributes :content_view_id
 attributes :default
 attributes :description
 attributes :package_count
+attributes :package_group_count
 attributes :puppet_module_count
 attributes :docker_manifest_count
 attributes :docker_tag_count
@@ -61,7 +62,7 @@ child :environments => :environments do
 end
 
 child :archived_repos => :repositories do
-  attributes :id, :name, :label
+  attributes :id, :name, :label, :content_type
 end
 
 child :last_event => :last_event do

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

@@ -1,4 +1,4 @@
-child :subscription_facet => :subscription do
+child :subscription_facet => :subscription_facet_attributes do
   extends 'katello/api/v2/subscription_facet/base'
 end
 

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

@@ -1,4 +1,4 @@
-child :subscription_facet => :subscription do |facet|
+child :subscription_facet => :subscription_facet_attributes do |facet|
   extends 'katello/api/v2/subscription_facet/base'
   consumer = Katello::Candlepin::Consumer.new(facet.uuid)
 

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -37,6 +37,9 @@ class MigrateContentHosts < ActiveRecord::Migration
   class Repository < ActiveRecord::Base
     self.table_name = "katello_repositories"
 
+    has_many :content_facet_repositories, :class_name => "MigrateContentHosts::ContentFacetRepository", :dependent => :destroy
+    has_many :content_facets, :through => :content_facet_repositories
+
     has_many :system_repositories, :class_name => "MigrateContentHosts::SystemRepository", :dependent => :destroy
     has_many :systems, :through => :system_repositories
   end
@@ -131,8 +134,8 @@ class MigrateContentHosts < ActiveRecord::Migration
     belongs_to :content_view, :inverse_of => :content_facets, :class_name => "MigrateContentHosts::ContentView"
     belongs_to :lifecycle_environment, :inverse_of => :content_facets, :class_name => "MigrateContentHosts::KTEnvironment"
 
-    has_many :bound_repositories, :through => :content_facet_repositories, :class_name => "MigrateContentHosts::Repository", :source => :repository
-    has_many :content_facet_repositories, :class_name => "MigrateContentHosts::ContentFacetRepository", :dependent => :destroy, :inverse_of => :content_facet
+    has_many :content_facet_repositories, :class_name => "MigrateContentHosts::ContentFacetRepository", :dependent => :destroy, :inverse_of => :content_facets
+    has_many :bound_repositories, :through => :content_facet_repositories, :class_name => "MigrateContentHosts::Repository", :source => :content_facets
     has_many :applicable_errata, :through => :content_facet_errata, :class_name => "MigrateContentHosts::Erratum", :source => :erratum
     has_many :content_facet_errata, :class_name => "MigrateContentHosts::ContentFacetErratum", :dependent => :destroy, :inverse_of => :content_facet
   end
@@ -190,6 +193,7 @@ class MigrateContentHosts < ActiveRecord::Migration
 
   def get_systems_with_facts(systems)
     systems_to_remove = []
+    systems = systems.to_a
 
     systems.each do |system|
       begin

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

@@ -49,12 +49,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
         $scope.errataOptions = [{name: "Current Environment", label: 'current'}, {name: 'foo', label: 'bar'}];
 
         $scope.detailsTable.initialLoad = false;
-        $scope.host.$promise.then(function() {
-            if ($scope.host.content && $scope.host.id) {
-                errataNutupane.setParams({id: $scope.host.id});
-                errataNutupane.load();
-            }
-        });
 
         $scope.setupErrataOptions = function (host) {
             var libraryString = translate("Library Synced Content"),
@@ -62,18 +56,18 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
                 previousEnv;
 
             if (host.hasContent()) {
-                currentEnv = translate("Current Environment (%e/%cv)").replace("%e", host.content.lifecycle_environment.name).replace("%cv", host.content.content_view_name);
+                currentEnv = translate("Current Environment (%e/%cv)").replace("%e", host.content_facet_attributes.lifecycle_environment.name).replace("%cv", host.content_facet_attributes.content_view_name);
                 $scope.errataOptions = [{name: currentEnv, label: 'current', order: 3}];
 
-                if (!host.content['lifecycle_environment_library?']) {
-                    Environment.get({id: host.content.lifecycle_environment.id}).$promise.then(function (env) {
-                        previousEnv = translate("Previous Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_view_name);
+                if (!host.content_facet_attributes['lifecycle_environment_library?']) {
+                    Environment.get({id: host.content_facet_attributes.lifecycle_environment.id}).$promise.then(function (env) {
+                        previousEnv = translate("Previous Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_facet_attributes.content_view_name);
                         $scope.errataOptions.push({name: previousEnv,
-                                                   label: 'prior', order: 2, 'content_view_id': host.content.content_view_id, 'environment_id': env.prior.id});
+                                                   label: 'prior', order: 2, 'content_view_id': host.content_facet_attributes.content_view_id, 'environment_id': env.prior.id});
 
                     });
                 }
-                if (!host.content['content_view_default?']) {
+                if (!host.content_facet_attributes['content_view_default?']) {
                     Organization.get({id: host.organization_id}).$promise.then(function (org) {
                         $scope.errataOptions.push({name: libraryString, label: 'library', order: 1,
                                                    'content_view_id': org.default_content_view_id, 'environment_id': org.library_id});
@@ -82,7 +76,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
             }
         };
 
-        $scope.host.$promise.then($scope.setupErrataOptions);
+        $scope.host.$promise.then(function() {
+            $scope.setupErrataOptions($scope.host);
+            if ($scope.host.content_facet_attributes && $scope.host.id) {
+                errataNutupane.setParams({id: $scope.host.id});
+                errataNutupane.load();
+            }
+        });
 
         $scope.refreshErrata = function (selected) {
             var option, errataParams;

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

@@ -37,7 +37,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         $scope.host.$promise.then(function (host) {
             $scope.hostFactsAsObject = doubleColonNotationToObject(host.facts);
             if (host.hasContent()) {
-                $scope.originalEnvironment = host.content.lifecycle_environment;
+                $scope.originalEnvironment = host.content_facet_attributes.lifecycle_environment;
             }
         });
 
@@ -51,7 +51,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
 
         $scope.environments = Organization.readableEnvironments({id: CurrentOrganization});
 
-        $scope.$watch('host.content.lifecycle_environment', function (environment) {
+        $scope.$watch('host.content_facet_attributes.lifecycle_environment', function (environment) {
             if (environment && $scope.originalEnvironment) {
                 if (environment.id !== $scope.originalEnvironment.id) {
                     $scope.editContentView = true;
@@ -67,7 +67,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         $scope.cancelContentViewUpdate = function () {
             if ($scope.editContentView) {
                 $scope.editContentView = false;
-                $scope.host.content['lifecycle_environment'] = $scope.originalEnvironment;
+                $scope.host.content_facet_attributes['lifecycle_environment'] = $scope.originalEnvironment;
                 $scope.disableEnvironmentSelection = false;
             }
         };
@@ -76,7 +76,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
             $scope.editContentView = false;
 
             $scope.saveContentFacet(host).then(function (response) {
-                $scope.originalEnvironment = response.content.lifecycle_environment;
+                $scope.originalEnvironment = response.content_facet_attributes.lifecycle_environment;
             });
             $scope.disableEnvironmentSelection = false;
         };
@@ -84,7 +84,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         $scope.releaseVersions = function () {
             var deferred = $q.defer();
 
-            ContentHost.releaseVersions({ id: $scope.host.subscription.uuid }, function (response) {
+            ContentHost.releaseVersions({ id: $scope.host.subscription_facet_attributes.uuid }, function (response) {
                 if (response.total === 0) {
                     $scope.showVersionAlert = true;
                 }
@@ -95,19 +95,19 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         };
 
         $scope.clearReleaseVersion = function () {
-            $scope.host.subscription['release_version'] = '';
+            $scope.host.subscription_facet_attributes['release_version'] = '';
             $scope.saveSubscriptionFacet($scope.host);
         };
 
         $scope.clearServiceLevel = function () {
-            $scope.host.subscription['service_level'] = '';
+            $scope.host.subscription_facet_attributes['service_level'] = '';
             $scope.saveSubscriptionFacet($scope.host);
         };
 
         $scope.contentViews = function () {
             var deferred = $q.defer();
 
-            ContentView.queryUnpaged({ 'environment_id': $scope.host.content.lifecycle_environment.id}, function (response) {
+            ContentView.queryUnpaged({ 'environment_id': $scope.host.content_facet_attributes.lifecycle_environment.id}, function (response) {
                 deferred.resolve(response.results);
                 $scope.contentViews = response.results;
             });
@@ -123,7 +123,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
 
         $scope.virtualGuestIds = function (host) {
             var ids = [];
-            angular.forEach(host.subscription['virtual_guests'], function (guest) {
+            angular.forEach(host.subscription_facet_attributes['virtual_guests'], function (guest) {
                 ids.push('name = %s'.replace('%s', guest.name));
             });
 

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

@@ -36,26 +36,28 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
         // @TODO begin hack for content and subscript facets
         // see http://projects.theforeman.org/issues/13763
         $scope.saveContentFacet = function (host) {
-            host['content_facet_attributes'] = {
-                id: host.content.id,
-                'content_view_id': host.content.content_view.id,
-                'lifecycle_environment_id': host.content.lifecycle_environment.id
+            var newHost = {id: host.id};
+            newHost['content_facet_attributes'] = {
+                id: host.content_facet_attributes.id,
+                'content_view_id': host.content_facet_attributes.content_view.id,
+                'lifecycle_environment_id': host.content_facet_attributes.lifecycle_environment.id
             };
-            return $scope.save(host);
+            return $scope.save(newHost, true);
         };
 
         $scope.saveSubscriptionFacet = function (host) {
-            host['subscription_facet_attributes'] = {
-                id: host.subscription.id,
-                autoheal: host.subscription.autoheal,
-                'service_level': host.subscription.service_level,
-                'release_version': host.subscription.release_version
+            var newHost = {id: host.id};
+            newHost['subscription_facet_attributes'] = {
+                id: host.subscription_facet_attributes.id,
+                autoheal: host.subscription_facet_attributes.autoheal,
+                'service_level': host.subscription_facet_attributes.service_level,
+                'release_version': host.subscription_facet_attributes.release_version
             };
-            return $scope.save(host);
+            return $scope.save(newHost, true);
         };
         // @TODO end hack
 
-        $scope.save = function (host) {
+        $scope.save = function (host, saveFacets) {
             var deferred = $q.defer();
 
             // @TODO begin hack needed to use the foreman host API, see the following bugs:
@@ -68,11 +70,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
             var whitelistedHostObject = {},
                 whitelist = [
                     "name",
-                    "description",
-                    "content_facet_attributes",
-                    "subscription_facet_attributes"
+                    "description"
                 ];
 
+            if (saveFacets) {
+                whitelist.push("content_facet_attributes");
+                whitelist.push("subscription_facet_attributes");
+            }
+
             angular.forEach(whitelist, function (key) {
                 whitelistedHostObject[key] = host[key];
             });

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

@@ -20,7 +20,7 @@
 
       <div class="detail">
         <span class="info-label" translate>UUID</span>
-        <span class="info-value">{{ host.subscription.uuid }}</span>
+        <span class="info-value">{{ host.subscription_facet_attributes.uuid }}</span>
       </div>
 
       <div class="detail">
@@ -40,31 +40,31 @@
       <div class="detail"
            bst-feature-flag="remote_actions">
         <span class="info-label" translate>Katello Agent</span>
-        <span class="info-value" ng-show="host.content.katello_agent_installed">
+        <span class="info-value" ng-show="host.content_facet_attributes.katello_agent_installed">
           <span class="fa fa-circle green"></span>
           <span translate>Installed</span>
         </span>
-        <span class="info-value" ng-hide="host.content.katello_agent_installed">
+        <span class="info-value" ng-hide="host.content_facet_attributes.katello_agent_installed">
           <span class="fa fa-circle yellow"></span>
           <span translate>Not installed</span>
         </span>
       </div>
 
-      <div ng-show="host.subscription.virtual_guests" class="detail">
+      <div ng-show="host.subscription_facet_attributes.virtual_guests" class="detail">
         <span class="info-label" translate>Virtual Guests</span>
         <div class="info-value">
           <a ng-click="reloadSearch(virtualGuestIds(host))"
-               translate translate-n="host.subscription.virtual_guests.length"
-               translate-plural="{{ host.subscription.virtual_guests.length }} Content Hosts">
+               translate translate-n="host.subscription_facet_attributes.virtual_guests.length"
+               translate-plural="{{ host.subscription_facet_attributes.virtual_guests.length }} Content Hosts">
              1 Content Host
           </a>
         </div>
       </div>
 
-      <div ng-show="host.subscription.virtual_host" class="detail">
+      <div ng-show="host.subscription_facet_attributes.virtual_host" class="detail">
         <span class="info-label" translate>Virtual Host</span>
         <div class="info-value">
-          <a ui-sref="content-hosts.details.info({hostId: host.subscription.virtual_host.id })">{{ host.subscription.virtual_host.name }}</a>
+          <a ui-sref="content-hosts.details.info({hostId: host.subscription_facet_attributes.virtual_host.id })">{{ host.subscription_facet_attributes.virtual_host.name }}</a>
         </div>
       </div>
 
@@ -82,11 +82,11 @@
         </span>
       </div>
 
-      <div ng-show=" host.subscription.compliance_reasons.length > 0" class="detail">
+      <div ng-show=" host.subscription_facet_attributes.compliance_reasons.length > 0" class="detail">
         <span class="info-label" translate>Details</span>
         <div class="info-value">
           <ul class="compliance-reasons">
-            <li ng-repeat="reason in host.subscription.compliance_reasons">{{ reason }}</li>
+            <li ng-repeat="reason in host.subscription_facet_attributes.compliance_reasons">{{ reason }}</li>
           </ul>
         </div>
       </div>
@@ -94,7 +94,7 @@
       <div class="detail">
         <span class="info-label" translate>Auto-Attach</span>
         <span class="info-value"
-              bst-edit-checkbox="host.subscription.autoheal"
+              bst-edit-checkbox="host.subscription_facet_attributes.autoheal"
               readonly="denied('edit_hosts', host)"
               formatter="booleanToYesNo"
               on-save="saveSubscriptionFacet(host)">
@@ -103,9 +103,9 @@
       <div class="detail">
         <span class="info-label" translate>Service Level</span>
         <span class="info-value"
-              bst-edit-select="host.subscription.service_level"
+              bst-edit-select="host.subscription_facet_attributes.service_level"
               readonly="denied('edit_hosts', host)"
-              selector="host.subscription.service_level"
+              selector="host.subscription_facet_attributes.service_level"
               options="serviceLevels()"
               options-format="option for option in options"
               deletable="true"
@@ -146,12 +146,12 @@
     <section ng-show="host.hasContent()">
       <h4 translate>Installed Products</h4>
 
-      <p translate ng-show="!host.subscription.installed_products || host.subscription.installed_products.length == 0">
+      <p translate ng-show="!host.subscription_facet_attributes.installed_products || host.subscription_facet_attributes.installed_products.length == 0">
         You do not have any Installed Products
       </p>
 
-      <div ng-show="host.subscription.installed_products.length > 0">
-        <div ng-repeat="product in host.subscription.installed_products" class="detail">
+      <div ng-show="host.subscription_facet_attributes.installed_products.length > 0">
+        <div ng-repeat="product in host.subscription_facet_attributes.installed_products" class="detail">
           <span class="info-label" translate>Product</span>
           <span class="info-value">{{ product.productName }} {{ product.version }}</span>
         </div>
@@ -169,9 +169,9 @@
         <span class="info-value">
           <a ui-sref="content-hosts.details.errata.index({getSearch: 'type=security'})">
             <i class="fa fa-warning inline-icon"
-               ng-class="{black: host.content.errata_counts.security === 0, red: host.content.errata_counts.security > 0}"
+               ng-class="{black: host.content_facet_attributes.errata_counts.security === 0, red: host.content_facet_attributes.errata_counts.security > 0}"
                title="{{ 'Security' | translate }}"></i>
-            {{ host.content.errata_counts.security || 0 }}
+            {{ host.content_facet_attributes.errata_counts.security || 0 }}
           </a>
         </span>
       </div>
@@ -181,9 +181,9 @@
         <span class="info-value">
           <a ui-sref="content-hosts.details.errata.index({getSearch: 'type=bugfix'})">
             <i class="fa fa-bug inline-icon"
-               ng-class="{black: host.content.errata_counts.bugfix === 0, yellow: host.content.errata_counts.bugfix > 0}"
+               ng-class="{black: host.content_facet_attributes.errata_counts.bugfix === 0, yellow: host.content_facet_attributes.errata_counts.bugfix > 0}"
                title="{{ 'Bug Fix' | translate }}"></i>
-            {{ host.content.errata_counts.bugfix || 0 }}
+            {{ host.content_facet_attributes.errata_counts.bugfix || 0 }}
           </a>
         </span>
       </div>
@@ -193,9 +193,9 @@
         <span class="info-value">
           <a ui-sref="content-hosts.details.errata.index({getSearch: 'type=enhancement'})">
             <i class="fa fa-plus-square inline-icon"
-               ng-class="{black: host.content.errata_counts.enhancement === 0, yellow: host.content.errata_counts.enhancement > 0}"
+               ng-class="{black: host.content_facet_attributes.errata_counts.enhancement === 0, yellow: host.content_facet_attributes.errata_counts.enhancement > 0}"
                title="{{ 'Enhancement' | translate }}"></i>
-            {{ host.content.errata_counts.enhancement || 0 }}
+            {{ host.content_facet_attributes.errata_counts.enhancement || 0 }}
           </a>
         </span>
       </div>
@@ -208,9 +208,9 @@
       <div class="detail">
         <span class="info-label" translate>Release Version</span>
         <span class="info-value"
-              bst-edit-select="host.subscription.release_version"
+              bst-edit-select="host.subscription_facet_attributes.release_version"
               readonly="denied('edit_hosts', host)"
-              selector="host.subscription.release_version"
+              selector="host.subscription_facet_attributes.release_version"
               options="releaseVersions()"
               options-format="option for option in options"
               deletable="true"
@@ -220,7 +220,7 @@
         </span>
         <div alert type="'info'" ng-show="showVersionAlert">
           <p translate>
-            No alternate release version choices are available. The available releases are based upon what is available in "{{ host.content.content_view.name }}", the selected <a href="/content_views">content view</a> this content host is attached to for the given <a href="/lifecycle_environments">lifecycle environment</a>, "{{ host.content.lifecycle_environment.name }}".
+            No alternate release version choices are available. The available releases are based upon what is available in "{{ host.content_facet_attributes.content_view.name }}", the selected <a href="/content_views">content view</a> this content host is attached to for the given <a href="/lifecycle_environments">lifecycle environment</a>, "{{ host.content_facet_attributes.lifecycle_environment.name }}".
           </p>
         </div>
       </div>
@@ -228,9 +228,9 @@
       <div class="detail" bst-feature-flag="lifecycle_environments">
         <span class="info-label" translate>Content View</span>
         <span class="info-value"
-              bst-edit-select="host.content.content_view.name"
+              bst-edit-select="host.content_facet_attributes.content_view.name"
               readonly="denied('edit_hosts', host)"
-              selector="host.content.content_view.id"
+              selector="host.content_facet_attributes.content_view.id"
               options="contentViews()"
               on-cancel="cancelContentViewUpdate()"
               on-save="saveContentView(host)"
@@ -253,7 +253,7 @@
         </div>
         <span class="info-label" translate>Environment</span>
         <span path-selector="environments"
-              ng-model="host.content.lifecycle_environment"
+              ng-model="host.content_facet_attributes.lifecycle_environment"
               mode="singleSelect"
               disabled="denied('edit_hosts', host)"
               disable-trigger="disableEnvironmentSelection">
@@ -268,26 +268,26 @@
 
       <div class="detail">
         <span class="info-label" translate>Registered</span>
-        <span class="info-value">{{ contentHost.created | date:'short' }}</span>
+        <span class="info-value">{{ host.created | date:'short' }}</span>
       </div>
 
       <div class="detail">
         <span class="info-label" translate> Registered By</span>
         <span class="info-value"
               translate
-              ng-show="host.subscription.activation_keys.length == 0">
+              ng-show="host.subscription_facet_attributes.activation_keys.length == 0">
           {{ contentHost.registered_by }}
         </span>
         <span class="info-value"
-              ng-show="host.subscription.activation_keys.length > 0"
+              ng-show="host.subscription_facet_attributes.activation_keys.length > 0"
               translate
-              translate-n="host.subscription.activation_keys.length"
+              translate-n="host.subscription_facet_attributes.activation_keys.length"
               translate-plural="Activation Keys">
           Activation Key
         </span>
         <span class="info-value">
-          <ul ng-show="host.subscription.activation_keys.length > 0">
-            <li ng-repeat="activation_key in host.subscription.activation_keys">
+          <ul ng-show="host.subscription_facet_attributes.activation_keys.length > 0">
+            <li ng-repeat="activation_key in host.subscription_facet_attributes.activation_keys">
               <span>
                 <a ui-sref="activation-keys.details.info({activationKeyId: activation_key.id})">
                   {{ activation_key.name }}
@@ -301,7 +301,7 @@
 
       <div class="detail">
         <span class="info-label" translate>Last Checkin</span>
-        <span class="info-value">{{ (host.subscription.last_checkin | date:'short') || ("Never checked in" | translate) }}</span>
+        <span class="info-value">{{ (host.subscription_facet_attributes.last_checkin | date:'short') || ("Never checked in" | translate) }}</span>
       </div>
 
       <div class="divider"></div>

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

@@ -22,16 +22,16 @@
     <div class="detail">
       <span class="info-label" translate>Status</span>
         <span class="info-value">
-          <i class="fa fa-circle" ng-class="contentHostTable.getSubscriptionStatusColor(host.subscription.subscription_status.color_code)"></i>
-          {{ host.subscription.subscription_status.label }}
+          <i class="fa fa-circle" ng-class="contentHostTable.getSubscriptionStatusColor(host.subscription_facet_attributes.subscription_status.color_code)"></i>
+          {{ host.subscription_facet_attributes.subscription_status.label }}
         </span>
     </div>
 
-    <div ng-show="host.subscription.compliance_reasons.length > 0" class="detail">
+    <div ng-show="host.subscription_facet_attributes.compliance_reasons.length > 0" class="detail">
       <span class="info-label" translate>Details</span>
       <div class="info-value">
         <ul class="compliance-reasons">
-          <li ng-repeat="reason in host.subscription.compliance_reasons">{{ reason }}</li>
+          <li ng-repeat="reason in host.subscription_facet_attributes.compliance_reasons">{{ reason }}</li>
         </ul>
       </div>
     </div>
@@ -39,7 +39,7 @@
     <div class="detail">
       <span class="info-label" translate>Auto-Attach</span>
       <span class="info-value"
-            bst-edit-checkbox="host.subscription.autoheal"
+            bst-edit-checkbox="host.subscription_facet_attributes.autoheal"
             formatter="booleanToYesNo"
             readonly="denied('edit_hosts', host)"
             on-save="saveSubscriptionFacet(host)">
@@ -48,9 +48,9 @@
     <div class="detail">
       <span class="info-label" translate>Service Level</span>
           <span class="info-value"
-                bst-edit-select="host.subscription.service_level"
+                bst-edit-select="host.subscription_facet_attributes.service_level"
                 readonly="denied('edit_hosts', host)"
-                selector="host.subscription.service_level"
+                selector="host.subscription_facet_attributes.service_level"
                 options="serviceLevels()"
                 options-format="option for option in options"
                 on-save="saveSubscriptionFacet(host)">

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

@@ -34,14 +34,14 @@
       </td>
       <td>
         <a ui-sref="content-hosts.details.errata.index({hostId: host.id})">
-          <span class="aligned-errata-count" errata-counts="host.content.errata_counts"></span>
+          <span class="aligned-errata-count" errata-counts="host.content_facet_attributes.errata_counts"></span>
         </a>
       </td>
       <td bst-table-cell>{{ host.operatingsystem_name }}</td>
-      <td bst-table-cell>{{ host.content.lifecycle_environment.name }}</td>
-      <td bst-table-cell>{{ host.content.content_view.name || "" }}</td>
-      <td bst-table-cell>{{ (host.subscription.registered_at | date:'short') || ("Never registered" | translate) }}</td>
-      <td bst-table-cell>{{ (host.subscription.last_checkin | date:'short') || ("Never checked in" | translate) }}</td>
+      <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>
+      <td bst-table-cell>{{ host.content_facet_attributes.content_view.name || "" }}</td>
+      <td bst-table-cell>{{ (host.subscription_facet_attributes.registered_at | date:'short') || ("Never registered" | translate) }}</td>
+      <td bst-table-cell>{{ (host.subscription_facet_attributes.last_checkin | date:'short') || ("Never checked in" | translate) }}</td>
     </tr>
   </tbody>
 </table>

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

@@ -13,6 +13,26 @@
 
         $scope.version = ContentViewVersion.get({id: $scope.$stateParams.versionId});
 
+        $scope.hasRepositories = function (version, type) {
+            var found;
+
+            found = _.find(version.repositories, function (repository) {
+                return repository['content_type'] === type;
+            });
+
+            return found;
+        };
+
+        $scope.hasErrata = function (version) {
+            var found = false;
+
+            found = _.find(version['errata_counts'], function (counts) {
+                return counts !== 0;
+            });
+
+            return found;
+        };
+
     }
 
     angular

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

@@ -37,43 +37,50 @@
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.version.yum')}">
+      <li ng-class="{active: isState('content-views.details.version.yum')}"
+          ng-show="hasRepositories(version, 'yum')">
         <a ui-sref="content-views.details.version.yum({versionId: version.id})">
           <span translate>Yum Repositories</span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.version.packages')}">
+      <li ng-class="{active: isState('content-views.details.version.packages')}"
+          ng-show="version.package_count !== 0">
         <a ui-sref="content-views.details.version.packages({versionId: version.id})">
           <span translate>Packages</span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.version.package-groups')}">
+      <li ng-class="{active: isState('content-views.details.version.package-groups')}"
+          ng-show="version.package_group_count !== 0">
         <a ui-sref="content-views.details.version.package-groups({versionId: version.id})">
           <span translate>Package Groups</span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.version.errata')}">
+      <li ng-class="{active: isState('content-views.details.version.errata')}"
+          ng-show="hasErrata(version)">
         <a ui-sref="content-views.details.version.errata({versionId: version.id})">
           <span translate>Errata</span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.version.puppet-modules')}">
+      <li ng-class="{active: isState('content-views.details.version.puppet-modules')}"
+          ng-show="version.puppet_module_count !== 0">
         <a ui-sref="content-views.details.version.puppet-modules({versionId: version.id})">
           <span translate>Puppet Modules</span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.version.docker')}">
+      <li ng-class="{active: isState('content-views.details.version.docker')}"
+          ng-show="version.docker_tag_count !== 0 || version.docker_manifest_count !== 0">
         <a ui-sref="content-views.details.version.docker({versionId: version.id})">
           <span translate>Docker Repositories</span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.version.ostree-branches')}">
+      <li ng-class="{active: isState('content-views.details.version.ostree-branches')}"
+          ng-show="version.ostree_branch_count !== 0">
         <a ui-sref="content-views.details.version.ostree-branches({versionId: version.id})">
           <span translate>OSTree Branches</span>
         </a>

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

@@ -44,8 +44,8 @@
             {{ host.name}}
           </a>
         </td>
-        <td bst-table-cell >{{ host.content.lifecycle_environment.name}}</td>
-        <td bst-table-cell >{{ host.content.content_view.name}}</td>
+        <td bst-table-cell >{{ host.content_facet_attributes.lifecycle_environment.name}}</td>
+        <td bst-table-cell >{{ host.content_facet_attributes.name}}</td>
       </tr>
 
       </tbody>

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

@@ -43,8 +43,8 @@
               {{ host.name}}
             </a>
           </td>
-          <td bst-table-cell >{{ host.content.lifecycle_environment.name}}</td>
-          <td bst-table-cell >{{ host.content.content_view.name}}</td>
+          <td bst-table-cell >{{ host.content_facet_attributes.lifecycle_environment.name}}</td>
+          <td bst-table-cell >{{ host.content_facet_attributes.content_view.name}}</td>
         </tr>
 
       </tbody>

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

@@ -15,10 +15,10 @@ angular.module('Bastion.hosts').factory('Host',
             autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
         });
         resource.prototype.hasContent = function () {
-            return angular.isDefined(this.content) && angular.isDefined(this.content.uuid);
+            return angular.isDefined(this.content_facet_attributes) && angular.isDefined(this.content_facet_attributes.uuid);
         };
         resource.prototype.hasSubscription = function () {
-            return angular.isDefined(this.subscription) && angular.isDefined(this.subscription.uuid);
+            return angular.isDefined(this.subscription_facet_attributes) && angular.isDefined(this.subscription_facet_attributes.uuid);
         };
         return resource;
     }]

data/lib/katello/engine.rb

@@ -44,7 +44,13 @@ module Katello
     initializer 'katello.configure_assets', :group => :all do
       def find_assets(args = {})
         type = args.fetch(:type, nil)
-        asset_dir = "#{Katello::Engine.root}/app/assets/#{type}/"
+        vendor = args.fetch(:vendor, false)
+
+        if vendor
+          asset_dir = "#{Katello::Engine.root}/vendor/assets/#{type}/"
+        else
+          asset_dir = "#{Katello::Engine.root}/app/assets/#{type}/"
+        end
 
         asset_paths = Dir[File.join(asset_dir, '**', '*')].reject { |file| File.directory?(file) }
         asset_paths.each { |file| file.slice!(asset_dir) }
@@ -54,6 +60,7 @@ module Katello
 
       javascripts = find_assets(:type => 'javascripts')
       images = find_assets(:type => 'images')
+      vendor_images = find_assets(:type => 'images', :vendor => true)
 
       precompile = [
         'katello/katello.css',
@@ -62,8 +69,10 @@ module Katello
         'bastion_katello/bastion_katello.js',
         /bastion_katello\S+.(?:svg|eot|woff|ttf)$/
       ]
+
       precompile.concat(javascripts)
       precompile.concat(images)
+      precompile.concat(vendor_images)
 
       SETTINGS[:katello] = {} unless SETTINGS.key?(:katello)
       SETTINGS[:katello][:assets] = {:precompile => precompile}

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.0.0.rc2"
+  VERSION = "3.0.0.rc3"
 end

data/vendor/assets/stylesheets/katello/{jquery.treeTable.css → jquery.treeTable.scss}

@@ -15,11 +15,11 @@
 }
 
 .treeTable tr.collapsed td .expander {
-  background-image: url(icons/expander-collapsed.png);
+  background-image: image-url("katello/icons/expander-collapsed.png");
 }
 
 .treeTable tr.expanded td .expander {
-  background-image: url(icons/expander-expanded.png);
+  background-image: image-url("katello/icons/expander-expanded.png");
 }
 
 /* jquery.treeTable.sortable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0.rc3
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1938,7 +1938,7 @@ files:
 - vendor/assets/stylesheets/katello/jquery.loadmask.css
 - vendor/assets/stylesheets/katello/jquery.multiselect.css
 - vendor/assets/stylesheets/katello/jquery.multiselect.filter.css
-- vendor/assets/stylesheets/katello/jquery.treeTable.css
+- vendor/assets/stylesheets/katello/jquery.treeTable.scss
 - vendor/assets/stylesheets/katello/ui.spinner.css
 homepage: http://www.katello.org
 licenses: []