Executed the inventory execute_role

Replaced with the 'use_role', which is now useful.

 Completes #1959
This commit is contained in:
Akita Noek
2016-05-20 14:10:29 -04:00
parent 17272fec05
commit fd9c96aa80
5 changed files with 22 additions and 31 deletions

View File

@@ -102,18 +102,14 @@ class Inventory(CommonModel, ResourceMixin):
update_role = ImplicitRoleField(
parent_role='admin_role',
)
use_role = ImplicitRoleField(
parent_role='admin_role',
)
adhoc_role = ImplicitRoleField(
parent_role='admin_role',
)
execute_role = ImplicitRoleField(
use_role = ImplicitRoleField(
parent_role='adhoc_role',
)
read_role = ImplicitRoleField(parent_role=[
'organization.auditor_role',
'execute_role',
'update_role',
'use_role',
'admin_role',
@@ -526,13 +522,13 @@ class Group(CommonModelNameNotUnique, ResourceMixin):
adhoc_role = ImplicitRoleField(
parent_role=['inventory.adhoc_role', 'parents.adhoc_role', 'admin_role'],
)
execute_role = ImplicitRoleField(
parent_role=['inventory.execute_role', 'parents.execute_role', 'adhoc_role'],
use_role = ImplicitRoleField(
parent_role=['inventory.use_role', 'parents.use_role', 'adhoc_role'],
)
read_role = ImplicitRoleField(parent_role=[
'inventory.read_role',
'parents.read_role',
'execute_role',
'use_role',
'update_role',
'admin_role'
])