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

Merge pull request #5149 from ryanpetrello/fix-5148

Browse Source 
default certain LDAP settings to None instead of an empty string
This commit is contained in:
Ryan Petrello
2017-02-02 13:21:40 -05:00
committed by GitHub
parent 028314f38f 5bd670291b
commit 7dde6bbb3c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/sso/conf.py
View File

@@ -270,7 +270,7 @@ register(
field_class=fields.LDAPDNWithUserField, field_class=fields.LDAPDNWithUserField,
allow_blank=True, allow_blank=True,
allow_null=True, allow_null=True,
default='', default=None,
label=_('LDAP User DN Template'), label=_('LDAP User DN Template'),
help_text=_('Alternative to user search, if user DNs are all of the same ' help_text=_('Alternative to user search, if user DNs are all of the same '
'format. This approach will be more efficient for user lookups than ' 'format. This approach will be more efficient for user lookups than '
@@ -340,7 +340,7 @@ register(
field_class=fields.LDAPDNField, field_class=fields.LDAPDNField,
allow_blank=True, allow_blank=True,
allow_null=True, allow_null=True,
default='', default=None,
label=_('LDAP Require Group'), label=_('LDAP Require Group'),
help_text=_('Group DN required to login. If specified, user must be a member ' help_text=_('Group DN required to login. If specified, user must be a member '
'of this group to login via LDAP. If not set, everyone in LDAP ' 'of this group to login via LDAP. If not set, everyone in LDAP '
@@ -357,7 +357,7 @@ register(
field_class=fields.LDAPDNField, field_class=fields.LDAPDNField,
allow_blank=True, allow_blank=True,
allow_null=True, allow_null=True,
default='', default=None,
label=_('LDAP Deny Group'), label=_('LDAP Deny Group'),
help_text=_('Group DN denied from login. If specified, user will not be ' help_text=_('Group DN denied from login. If specified, user will not be '
'allowed to login if a member of this group. Only one deny group ' 'allowed to login if a member of this group. Only one deny group '