Fixes #36569 - List only supported Job Templates on upstream

theforeman · Jul 19, 2023 · 99eb6f2 · 99eb6f2
1 parent 5b44890
commit 99eb6f2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/app/controllers/concerns/foreman/controller/parameters/job_template_extensions.rb b/app/controllers/concerns/foreman/controller/parameters/job_template_extensions.rb
@@ -4,6 +4,17 @@ module Parameters
       module JobTemplateExtensions
         extend ActiveSupport::Concern
 
+        UNSUPPORTED_JOB_TEMPLATES = [
+          'Capsule Upgrade Playbook'
+        ].freeze
+
+        def index
+          return super if Foreman::Plugin.find('foreman_theme_satellite').present?
+
+          @templates = super
+          @templates = @templates.where.not(name: JobTemplateExtensions::UNSUPPORTED_JOB_TEMPLATES)
+        end
+
         class_methods do
           def job_template_params_filter
             super.tap do |filter|

diff --git a/app/controllers/foreman_ansible/api/v2/job_templates_controller_extensions.rb b/app/controllers/foreman_ansible/api/v2/job_templates_controller_extensions.rb
@@ -6,12 +6,24 @@ module V2
       # Extends the job_templates api controller to support creating/updating with ansible callback plugin
       module JobTemplatesControllerExtensions
         extend Apipie::DSL::Concern
+        extend ActiveSupport::Concern
+
+        UNSUPPORTED_JOB_TEMPLATES = [
+          'Capsule Upgrade Playbook'
+        ].freeze
 
         update_api(:create, :update) do
           param :job_template, Hash do
             param :ansible_callback_enabled, :bool, :desc => N_('Enable the callback plugin for this template')
           end
         end
+
+        def index
+          return super if Foreman::Plugin.find('foreman_theme_satellite').present?
+
+          @job_templates = super
+          @job_templates = @job_templates.where.not(name: JobTemplatesControllerExtensions::UNSUPPORTED_JOB_TEMPLATES)
+        end
       end
     end
   end

diff --git a/lib/foreman_ansible/engine.rb b/lib/foreman_ansible/engine.rb
@@ -66,6 +66,7 @@ class Engine < ::Rails::Engine
       ::Api::V2::HostgroupsController.include ForemanAnsible::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::HostgroupsController.include ForemanAnsible::Api::V2::HostgroupsParamGroupExtensions
       ::ConfigReportImporter.include ForemanAnsible::AnsibleReportImporter
+      ::Api::V2::JobTemplatesController.prepend ForemanAnsible::Api::V2::JobTemplatesControllerExtensions
       ::Api::V2::JobTemplatesController.include ForemanAnsible::Api::V2::JobTemplatesControllerExtensions
       ::Api::V2::JobTemplatesController.include Foreman::Controller::Parameters::JobTemplateExtensions
       ::JobTemplatesController.include Foreman::Controller::Parameters::JobTemplateExtensions