Skip to content

Commit ebe87a4

Browse files
committed
Fixed the bug where vault credentials were not appearing in service catalog items and removed the duplicate column of vault credentials.
Fixed the bug where vault credentials were not appearing in service catalog items and removed the duplicate column of vault credentials.
1 parent 960ba3a commit ebe87a4

File tree

3 files changed

+330
-331
lines changed

3 files changed

+330
-331
lines changed

app/helpers/catalog_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ def catalog_generic_template_info(type, record, info)
193193
rows.push(row_data(_('Playbook'), info[:playbook]))
194194
rows.push(row_data(_('Machine Credential'), info[:machine_credential]))
195195
rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
196-
rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
197196
rows.push(row_data(_('Cloud Credential'), info[:cloud_credential]))
198197
rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
199198
rows.push(row_data(_('Hosts'), record.config_info[type][:hosts]))

app/javascript/components/ansible-playbook-edit-catalog-form/schema.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ const provisionTabSchema = (
163163
},
164164
{
165165
component: componentTypes.SELECT,
166-
id: 'config_info.provision.vault_credentials',
167-
name: 'config_info.provision.vault_credentials',
166+
id: 'config_info.provision.vault_credential_id',
167+
name: 'config_info.provision.vault_credential_id',
168168
label: __('Vault Credential'),
169169
options: transformGeneralOptions(vaultCredentials),
170170
condition: {
@@ -371,8 +371,8 @@ const retirementTabSchema = (
371371
},
372372
{
373373
component: componentTypes.SELECT,
374-
id: 'config_info.retirement.vault_credentials',
375-
name: 'config_info.retirement.vault_credentials',
374+
id: 'config_info.retirement.vault_credential_id',
375+
name: 'config_info.retirement.vault_credential_id',
376376
label: __('Vault Credential'),
377377
options: transformGeneralOptions(vaultCredentials),
378378
condition: {

0 commit comments

Comments
 (0)