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

Merge pull request #1749 from AlanCoding/fix_team_parents

Browse Source 
Fix team parentage being removed
This commit is contained in:
Alan Rominger
2018-05-11 07:19:17 -04:00
committed by GitHub
parent 79ccabd0bd 949895d0bc
commit 1b64e52f64
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/fields.py
View File

@@ -193,8 +193,10 @@ def update_role_parentage_for_instance(instance):
''' '''
for implicit_role_field in getattr(instance.__class__, '__implicit_role_fields'): for implicit_role_field in getattr(instance.__class__, '__implicit_role_fields'):
cur_role = getattr(instance, implicit_role_field.name) cur_role = getattr(instance, implicit_role_field.name)
original_parents = set(json.loads(cur_role.implicit_parents))
new_parents = implicit_role_field._resolve_parent_roles(instance) new_parents = implicit_role_field._resolve_parent_roles(instance)
cur_role.parents.set(new_parents) cur_role.parents.remove(*list(original_parents - new_parents))
cur_role.parents.add(*list(new_parents - original_parents))
new_parents_list = list(new_parents) new_parents_list = list(new_parents)
new_parents_list.sort() new_parents_list.sort()
new_parents_json = json.dumps(new_parents_list) new_parents_json = json.dumps(new_parents_list)

2
awx/main/models/rbac.py
View File

@@ -172,7 +172,7 @@ class Role(models.Model):
elif accessor.__class__.__name__ == 'Team': elif accessor.__class__.__name__ == 'Team':
return self.ancestors.filter(pk=accessor.member_role.id).exists() return self.ancestors.filter(pk=accessor.member_role.id).exists()
elif type(accessor) == Role: elif type(accessor) == Role:
return self.ancestors.filter(pk=accessor).exists() return self.ancestors.filter(pk=accessor.pk).exists()
else: else:
accessor_type = ContentType.objects.get_for_model(accessor) accessor_type = ContentType.objects.get_for_model(accessor)
roles = Role.objects.filter(content_type__pk=accessor_type.id, roles = Role.objects.filter(content_type__pk=accessor_type.id,

9
awx/main/tests/functional/test_rbac_core.py
View File

@@ -5,6 +5,7 @@ from awx.main.models import (
Organization, Organization,
Project, Project,
) )
from awx.main.fields import update_role_parentage_for_instance
@pytest.mark.django_db @pytest.mark.django_db
@@ -202,3 +203,11 @@ def test_auto_parenting():
assert org1.admin_role.is_ancestor_of(prj2.admin_role) is False assert org1.admin_role.is_ancestor_of(prj2.admin_role) is False
assert org2.admin_role.is_ancestor_of(prj1.admin_role) assert org2.admin_role.is_ancestor_of(prj1.admin_role)
assert org2.admin_role.is_ancestor_of(prj2.admin_role) assert org2.admin_role.is_ancestor_of(prj2.admin_role)
@pytest.mark.django_db
def test_update_parents_keeps_teams(team, project):
project.update_role.parents.add(team.member_role)
assert team.member_role in project.update_role # test prep sanity check
update_role_parentage_for_instance(project)
assert team.member_role in project.update_role # actual assertion