External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-27 16:09:55 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix issue when string list settings field is null. Resolves #3683.

Browse Source
This commit is contained in:
Chris Church
2016-10-12 14:47:22 -04:00
parent 2488e1e3f0
commit 8883738a7c
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/sso/conf.py
View File

@@ -126,7 +126,8 @@ register(
register(
'SOCIAL_AUTH_ORGANIZATION_MAP',
field_class=fields.SocialOrganizationMapField,
default={},
allow_null=True,
default=None,
label=_('Social Auth Organization Map'),
help_text=SOCIAL_AUTH_ORGANIZATION_MAP_HELP_TEXT,
category=_('Authentication'),
@@ -137,7 +138,8 @@ register(
register(
'SOCIAL_AUTH_TEAM_MAP',
field_class=fields.SocialTeamMapField,
default={},
allow_null=True,
default=None,
label=_('Social Auth Team Map'),
help_text=SOCIAL_AUTH_TEAM_MAP_HELP_TEXT,
category=_('Authentication'),