plugin.rb in katello-4.1.0.rc1

- old
+ new

@@ -172,21 +172,10 @@
            :url_hash => {:controller => 'katello/api/v2/ansible_collections',
                          :action => 'index'},
            :engine => Katello::Engine,
            :turbolinks => false
     end
-
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::PUPPET_TYPE)
-      menu :top_menu,
-           :puppet_modules,
-           :caption => N_('Puppet Modules'),
-           :url => '/puppet_modules',
-           :url_hash => {:controller => 'katello/api/v2/puppet_modules',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
   end
 
   menu :top_menu,
        :content_hosts,
        :caption => N_('Content Hosts'),
@@ -280,18 +269,16 @@
   register_status_extension { Katello::Ping.status }
 
   extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/pulp_info'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/host_collections'
 
-  # Extend Global Registration endpoint
-  extend_allowed_registration_vars :activation_key
+  # Katello variables for Host Registration
+  extend_allowed_registration_vars :activation_keys
+  extend_allowed_registration_vars :lifecycle_environment_id
+  extend_allowed_registration_vars :force
+  extend_allowed_registration_vars :ignore_subman_errors
 
-  # Extend Global Registration UI
-  extend_page 'registration/_form' do |cx|
-    cx.add_pagelet :global_registration, name: N_('Katello'), partial: 'foreman/hosts/registration', priority: 100, id: 'katello'
-  end
-
   extend_page "smart_proxies/show" do |cx|
     cx.add_pagelet :details_content,
                    :name => _('Storage'),
                    :partial => 'smart_proxies/show/storage',
                    :onlyif => proc { |proxy| proxy.has_feature?(SmartProxy::PULP_FEATURE) || proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) || proxy.has_feature?(SmartProxy::PULP3_FEATURE) }
@@ -367,10 +354,10 @@
     :create_hosts, :edit_hosts, :destroy_hosts,
     :view_content_views, :view_content_credentials, :view_subscriptions,
     :attach_subscriptions, :view_host_collections,
     :view_organizations, :view_lifecycle_environments, :view_products,
     :view_locations, :view_domains, :view_architectures,
-    :view_operatingsystems
+    :view_operatingsystems, :view_smart_proxies
   ]
 
   def find_katello_assets(args = {})
     type = args.fetch(:type, nil)
     vendor = args.fetch(:vendor, false)