Skip to content

Commit

Permalink
Make attached user models adhere to new API assignments (#15298)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanCoding authored Jun 27, 2024
1 parent 7c08b29 commit dbc2215
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 3 additions & 3 deletions awx/main/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,17 @@ def cleanup_created_modified_by(sender, **kwargs):

@property
def user_get_organizations(user):
return Organization.objects.filter(member_role__members=user)
return Organization.access_qs(user, 'member')


@property
def user_get_admin_of_organizations(user):
return Organization.objects.filter(admin_role__members=user)
return Organization.access_qs(user, 'change')


@property
def user_get_auditor_of_organizations(user):
return Organization.objects.filter(auditor_role__members=user)
return Organization.access_qs(user, 'audit')


@property
Expand Down
8 changes: 8 additions & 0 deletions awx/main/tests/functional/dab_rbac/test_translation_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,11 @@ def test_implicit_parents_no_assignments(organization):
with mock.patch('awx.main.models.rbac.give_or_remove_permission') as mck:
Team.objects.create(name='random team', organization=organization)
mck.assert_not_called()


@pytest.mark.django_db
def test_user_auditor_rel(organization, rando, setup_managed_roles):
assert rando not in organization.auditor_role
audit_rd = RoleDefinition.objects.get(name='Organization Audit')
audit_rd.give_permission(rando, organization)
assert list(rando.auditor_of_organizations) == [organization]

0 comments on commit dbc2215

Please sign in to comment.