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

Merge pull request #2497 from AlanCoding/fix_two_creds2

Browse Source 
Fix server error using 2 creds of same type

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-24 19:14:32 +00:00
committed by GitHub
parent 331e272be0 8b3e49cb24
commit 556040fb8b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views/__init__.py
View File

@@ -3172,8 +3172,8 @@ class JobTemplateCredentialsList(SubListCreateAttachDetachAPIView):
def is_valid_relation(self, parent, sub, created=False): def is_valid_relation(self, parent, sub, created=False):
if sub.unique_hash() in [cred.unique_hash() for cred in parent.credentials.all()]: if sub.unique_hash() in [cred.unique_hash() for cred in parent.credentials.all()]:
return {"error": _("Cannot assign multiple {credential_type} credentials.".format( return {"error": _("Cannot assign multiple {credential_type} credentials.").format(
credential_type=sub.unique_hash(display=True)))} credential_type=sub.unique_hash(display=True))}
kind = sub.credential_type.kind kind = sub.credential_type.kind
if kind not in ('ssh', 'vault', 'cloud', 'net'): if kind not in ('ssh', 'vault', 'cloud', 'net'):
return {'error': _('Cannot assign a Credential of kind `{}`.').format(kind)} return {'error': _('Cannot assign a Credential of kind `{}`.').format(kind)}