External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 21:51:26 -03:30
Code Issues Packages Projects Releases Wiki Activity

Revert "Add Tower Configuration setting AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR"

Browse Source
This commit is contained in:
Aaron Tan 2017-09-22 09:48:32 -04:00 committed by GitHub
parent 9662719660
commit 93341d6108
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
awx/sso/conf.py
View File

@ -293,17 +293,6 @@ register(
default='MemberDNGroupType',
)
register(
'AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR',
field_class=fields.CharField,
default='member',
label=_('LDAP Group Type Member Attribute'),
help_text=_('Specify member_attr when AUTH_LDAP_GROUP_TYPE=MemberDNGroupType.'),
category=_('LDAP'),
category_slug='ldap',
feature_required='ldap',
)
register(
'AUTH_LDAP_REQUIRE_GROUP',
field_class=fields.LDAPDNField,

3
awx/sso/fields.py
View File

@ -323,8 +323,7 @@ class LDAPGroupTypeField(fields.ChoiceField):
if not data:
return None
if data.endswith('MemberDNGroupType'):
from django.conf import settings
return getattr(django_auth_ldap.config, data)(member_attr=settings.AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR)
return getattr(django_auth_ldap.config, data)(member_attr='member')
else:
return getattr(django_auth_ldap.config, data)()