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

more .users -> member_role.members

Browse Source
This commit is contained in:
Akita Noek
2016-03-15 17:00:20 -04:00
parent defe4a4fd8
commit 7e0d2e6729
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/sso/pipeline.py
View File

@@ -98,12 +98,12 @@ def update_user_orgs(backend, details, user=None, *args, **kwargs):
remove = bool(org_opts.get('remove', False))
admins_expr = org_opts.get('admins', None)
remove_admins = bool(org_opts.get('remove_admins', remove))
_update_m2m_from_expression(user, org.admins, admins_expr, remove_admins)
_update_m2m_from_expression(user, org.admin_role.members, admins_expr, remove_admins)
# Update org users from expression(s).
users_expr = org_opts.get('users', None)
remove_users = bool(org_opts.get('remove_users', remove))
_update_m2m_from_expression(user, org.users, users_expr, remove_users)
_update_m2m_from_expression(user, org.member_role.members, users_expr, remove_users)
def update_user_teams(backend, details, user=None, *args, **kwargs):
@@ -134,4 +134,4 @@ def update_user_teams(backend, details, user=None, *args, **kwargs):
team = Team.objects.get_or_create(name=team_name, organization=org)[0]
users_expr = team_opts.get('users', None)
remove = bool(team_opts.get('remove', False))
_update_m2m_from_expression(user, team.users, users_expr, remove)
_update_m2m_from_expression(user, team.member_role.members, users_expr, remove)