Merge pull request #11088 from saito-hideki/issue/10879

Fixed Org mapping behavior with SAML when Ansible Galaxy cred does not exist
This commit is contained in:
Chris Meyers 2021-10-08 10:48:11 -04:00 committed by GitHub
commit 6a2826b91c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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)