External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-20 22:18:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10271 from beeankha/galaxy_cred_export_bug

Browse Source 
Enable Export of Galaxy Credentials Associated to Organizations

SUMMARY

Addresses #9342

ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME


API

AWX VERSION

awx: 19.1.0

Reviewed-by: Shane McDonald <me@shanemcd.com>
Reviewed-by: Rebeccah Hunter <rhunter@redhat.com>
This commit is contained in:
softwarefactory-project-zuul[bot] 2021-05-26 14:55:19 +00:00 committed by GitHub
commit f0129c857b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awxkit/awxkit/api/pages/credentials.py
View File

@ -287,7 +287,10 @@ class Credential(HasCopy, HasCreate, base.Base):
return passwords
page.register_page([resources.credential, (resources.credentials, 'post'), (resources.credential_copy, 'post')], Credential)
page.register_page(
[resources.credential, (resources.credentials, 'post'), (resources.credential_copy, 'post'), (resources.organization_galaxy_credentials, 'post')],
Credential,
)
class Credentials(page.PageList, Credential):
@ -295,7 +298,7 @@ class Credentials(page.PageList, Credential):
pass
page.register_page([resources.credentials, resources.related_credentials], Credentials)
page.register_page([resources.credentials, resources.related_credentials, resources.organization_galaxy_credentials], Credentials)
class CredentialCopy(base.Base):

1
awxkit/awxkit/api/resources.py
View File

@ -140,6 +140,7 @@ class Resources(object):
_organization_admins = r'organizations/\d+/admins/'
_organization_applications = r'organizations/\d+/applications/'
_organization_execution_environments = r'organizations/\d+/execution_environments/'
_organization_galaxy_credentials = r'organizations/\d+/galaxy_credentials/'
_organization_inventories = r'organizations/\d+/inventories/'
_organization_users = r'organizations/\d+/users/'
_organizations = 'organizations/'