From 9e74ac24faf312998774a71bd205c8918e70c2fd Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Thu, 16 Sep 2021 23:25:50 +0900 Subject: [PATCH] Fixed Org mapping behavior with SAML when Ansible Galaxy cred does not exist - Fixes #10879 - Fixes ansible/tower#5061 Signed-off-by: Hideki Saito --- awx/main/models/organization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/models/organization.py b/awx/main/models/organization.py index 9ec91cfb4b..277b33315e 100644 --- a/awx/main/models/organization.py +++ b/awx/main/models/organization.py @@ -118,7 +118,7 @@ class Organization(CommonModel, NotificationFieldsModel, ResourceMixin, CustomVi from awx.main.models import Credential public_galaxy_credential = Credential.objects.filter(managed=True, name='Ansible Galaxy').first() - if public_galaxy_credential not in self.galaxy_credentials.all(): + if public_galaxy_credential is not None and public_galaxy_credential not in self.galaxy_credentials.all(): self.galaxy_credentials.add(public_galaxy_credential)