External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-07 02:59:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Grant org JT admin role in migration as well

Browse Source
This commit is contained in:
AlanCoding
2020-03-11 15:50:00 -04:00
parent aa4842aea5
commit 7e6def8acc
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/migrations/_rbac.py
View File

@@ -159,14 +159,17 @@ def _restore_inventory_admins(apps, schema_editor, backward=False):
jt_qs = jt_qs.only('id', 'admin_role_id', 'execute_role_id', 'inventory_id') jt_qs = jt_qs.only('id', 'admin_role_id', 'execute_role_id', 'inventory_id')
for jt in jt_qs.iterator(): for jt in jt_qs.iterator():
org = jt.inventory.organization org = jt.inventory.organization
for role_name in ('admin_role', 'execute_role'): for jt_role, org_roles in (
role_id = getattr(jt, '{}_id'.format(role_name)) ('admin_role', ('admin_role', 'job_template_admin_role',)),
('execute_role', ('execute_role',))
):
role_id = getattr(jt, '{}_id'.format(jt_role))
user_qs = User.objects user_qs = User.objects
if not backward: if not backward:
# In this specific case, the name for the org role and JT roles were the same # In this specific case, the name for the org role and JT roles were the same
org_role_id = getattr(org, '{}_id'.format(role_name)) org_role_ids = [getattr(org, '{}_id'.format(role_name)) for role_name in org_roles]
user_qs = user_qs.filter(roles=org_role_id) user_qs = user_qs.filter(roles__in=org_role_ids)
# bizarre migration behavior - ancestors / descendents of # bizarre migration behavior - ancestors / descendents of
# migration version of Role model is reversed, using current model briefly # migration version of Role model is reversed, using current model briefly
ancestor_ids = list( ancestor_ids = list(
@@ -185,10 +188,10 @@ def _restore_inventory_admins(apps, schema_editor, backward=False):
if not user_ids: if not user_ids:
continue continue
role = getattr(jt, role_name) role = getattr(jt, jt_role)
logger.debug('{} {} on jt {} for users {} via inventory.organization {}'.format( logger.debug('{} {} on jt {} for users {} via inventory.organization {}'.format(
'Removing' if backward else 'Setting', 'Removing' if backward else 'Setting',
role_name, jt.pk, user_ids, org.pk jt_role, jt.pk, user_ids, org.pk
)) ))
if not backward: if not backward:
# in reverse, explit role becomes redundant # in reverse, explit role becomes redundant