From 894eeee9792bd728a6af8e5303a7d28e975f5b82 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 23 Mar 2018 15:25:11 -0400 Subject: [PATCH] inventory source can_change rm credential check --- awx/main/access.py | 1 - awx/main/tests/functional/test_rbac_inventory.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index 5e1252e853..bbbcd0652f 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -928,7 +928,6 @@ class InventorySourceAccess(BaseAccess): if obj and obj.inventory: return ( self.user.can_access(Inventory, 'change', obj.inventory, None) and - self.check_related('credential', Credential, data, obj=obj, role_field='use_role') and self.check_related('source_project', Project, data, obj=obj, role_field='use_role') ) # Can't change inventory sources attached to only the inventory, since diff --git a/awx/main/tests/functional/test_rbac_inventory.py b/awx/main/tests/functional/test_rbac_inventory.py index dd471ebf3f..3258b9d0ae 100644 --- a/awx/main/tests/functional/test_rbac_inventory.py +++ b/awx/main/tests/functional/test_rbac_inventory.py @@ -155,7 +155,7 @@ def test_host_access(organization, inventory, group, user, group_factory): def test_inventory_source_credential_check(rando, inventory_source, credential): inventory_source.inventory.admin_role.members.add(rando) access = InventorySourceAccess(rando) - assert not access.can_change(inventory_source, {'credential': credential}) + assert not access.can_attach(inventory_source, credential, 'credentials', {'id': credential.pk}) @pytest.mark.django_db