app/helpers/katello/providers_helper.rb in katello-3.0.0.rc1 vs app/helpers/katello/providers_helper.rb in katello-3.0.0.rc2
- old
+ new
@@ -9,25 +9,22 @@
{:id => :kickstarts, :name => _('Kickstarts'), :products => {}},
{:id => :srpms, :name => _('Source RPMs'), :products => {}},
{:id => :debug, :name => _('Debug RPMs'), :products => {}},
{:id => :beta, :name => _('Beta'), :products => {}},
{:id => :isos, :name => _('ISOs'), :products => {}},
- {:id => :docker_manifests, :name => _('Docker Manifests'), :products => {}},
{:id => :ostree, :name => _('OSTree'), :products => {}},
{:id => :other, :name => _('Other'), :products => {}}
]
end
def redhat_repo_tab(provider, tab_id)
tabs = {}.with_indifferent_access
redhat_repo_tabs.each { |tab| tabs[tab[:id]] = tab }
provider.products.each do |product|
- product.productContent.each do |prod_content|
+ product.displayable_product_contents.each do |prod_content|
name = prod_content.content.name
- if prod_content.content.type == ::Katello::Repository::CANDLEPIN_DOCKER_TYPE
- key = :docker_manifests
- elsif prod_content.content.type == ::Katello::Repository::CANDLEPIN_OSTREE_TYPE
+ if prod_content.content_type == ::Katello::Repository::CANDLEPIN_OSTREE_TYPE
key = :ostree
elsif name.include?(" Beta ")
key = :beta
elsif name.include?("(Source RPMs)")
key = :srpms