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

Remove the use of the deprecated Field.rel attribute

Browse Source 
Also, rename a number of variables named `rel` for ease of searching.
This commit is contained in:
Jeff Bradberry
2019-06-17 11:13:18 -04:00
parent e0693d3746
commit bcbb768dd3
9 changed files with 41 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/sso/backends.py
View File

@@ -307,7 +307,7 @@ class SAMLAuth(BaseSAMLAuth):
return super(SAMLAuth, self).get_user(user_id)
def _update_m2m_from_groups(user, ldap_user, rel, opts, remove=True):
def _update_m2m_from_groups(user, ldap_user, related, opts, remove=True):
'''
Hepler function to update m2m relationship based on LDAP group membership.
'''
@@ -328,10 +328,10 @@ def _update_m2m_from_groups(user, ldap_user, rel, opts, remove=True):
should_add = True
if should_add:
user.save()
rel.add(user)
elif remove and user in rel.all():
related.add(user)
elif remove and user in related.all():
user.save()
rel.remove(user)
related.remove(user)
@receiver(populate_user, dispatch_uid='populate-ldap-user')