Skip to content

Commit 46f0850

Browse files
authored
Merge pull request #9440 from agrare/fix_service_catalog_showing_all_automation_managers
Use ServiceTemplate.available_managers for AWX/Ansible Tower
2 parents 10e8c19 + 1b6cda0 commit 46f0850

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

app/controllers/catalog_controller.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@ def set_form_vars
13041304
@available_catalogs = available_catalogs.sort # Get available catalogs with tenants and ancestors
13051305
@additional_tenants = @edit[:new][:tenant_ids].map(&:to_s) # Get ids of selected Additional Tenants in the Tenants tree
13061306
available_orchestration_templates if @record.kind_of?(ServiceTemplateOrchestration)
1307-
available_ansible_tower_managers if @record.kind_of?(ServiceTemplateAnsibleTower) || @record.kind_of?(ServiceTemplateAwx)
1307+
available_automation_managers if @record.kind_of?(ServiceTemplateAnsibleTower) || @record.kind_of?(ServiceTemplateAwx)
13081308
available_container_managers if @record.kind_of?(ServiceTemplateContainerTemplate)
13091309
fetch_zones
13101310
@edit[:new][:zone_id] = @record.zone_id
@@ -1646,11 +1646,10 @@ def fetch_all_templates(manager_id)
16461646
return job_templates, workflow_templates
16471647
end
16481648

1649-
def available_ansible_tower_managers
1650-
@edit[:new][:available_managers] =
1651-
ManageIQ::Providers::AutomationManager.all.collect { |t| [t.name, t.id] }.sort
1652-
@edit[:new][:template_id] = @record.job_template.try(:id)
1653-
@edit[:new][:manager_id] = @record.job_template.try(:manager).try(:id)
1649+
def available_automation_managers
1650+
@edit[:new][:available_managers] = @record.available_managers.collect { |t| [t.name, t.id] }.sort
1651+
@edit[:new][:template_id] = @record.configuration_script.try(:id)
1652+
@edit[:new][:manager_id] = @record.configuration_script.try(:manager).try(:id)
16541653
available_job_templates(@edit[:new][:manager_id]) if @edit[:new][:manager_id]
16551654
end
16561655

0 commit comments

Comments
 (0)