External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 04:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'downstream' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2020-10-26 09:32:00 -04:00
parent d550487bc8 d2ceb39d73
commit 6097066cd8
17 changed files with 195 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awxkit/awxkit/cli/custom.py
View File

@@ -246,6 +246,7 @@ class AssociationMixin(object):
'success_notification': 'notification_templates',
'failure_notification': 'notification_templates',
'credential': 'credentials',
'galaxy_credential': 'credentials',
}[resource]
def get(self, **kwargs):
@@ -367,9 +368,11 @@ class OrganizationNotificationDisAssociation(NotificationAssociateMixin, CustomA
OrganizationNotificationAssociation.targets.update({
'approval_notification': ['notification_templates_approvals', 'notification_template'],
'galaxy_credential': ['galaxy_credentials', 'credential'],
})
OrganizationNotificationDisAssociation.targets.update({
'approval_notification': ['notification_templates_approvals', 'notification_template'],
'galaxy_credential': ['galaxy_credentials', 'credential'],
})