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

more parameters

Browse Source
This commit is contained in:
chris meyers
2018-03-15 16:59:35 -04:00
parent e3c362956d
commit 17795f82e8
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/sso/conf.py
View File

@@ -306,7 +306,6 @@ def _register_ldap(append=None):
category=_('LDAP'), category=_('LDAP'),
category_slug='ldap', category_slug='ldap',
default=collections.OrderedDict([ default=collections.OrderedDict([
#('member_attr', 'member'),
('name_attr', 'cn'), ('name_attr', 'cn'),
]), ]),
placeholder=collections.OrderedDict([ placeholder=collections.OrderedDict([

4
awx/sso/fields.py
View File

@@ -369,6 +369,10 @@ class LDAPGroupTypeField(fields.ChoiceField):
# MemberDNGroupType was the only group type, of the underlying lib, that # MemberDNGroupType was the only group type, of the underlying lib, that
# took a parameter. # took a parameter.
params_sanitized = dict() params_sanitized = dict()
if isinstance(cls, LDAPGroupType):
if 'name_attr' in params:
params_sanitized['name_attr'] = params['name_attr']
if data.endswith('MemberDNGroupType'): if data.endswith('MemberDNGroupType'):
params.setdefault('member_attr', 'member') params.setdefault('member_attr', 'member')
params_sanitized['member_attr'] = params['member_attr'] params_sanitized['member_attr'] = params['member_attr']

2
awx/sso/ldap_group_types.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2017 Ansible by Red Hat # Copyright (c) 2018 Ansible by Red Hat
# All Rights Reserved. # All Rights Reserved.
# Python # Python