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

update models to match new migrations

Browse Source
This commit is contained in:
Wayne Witzel III
2016-05-13 11:37:05 -04:00
parent 6a6194cc43
commit 911c92707c
5 changed files with 41 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/models/credential.py
View File

@@ -208,19 +208,14 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
'singleton:' + ROLE_SINGLETON_SYSTEM_ADMINISTRATOR, 'singleton:' + ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
], ],
) )
auditor_role = ImplicitRoleField(
parent_role=[
'singleton:' + ROLE_SINGLETON_SYSTEM_AUDITOR,
],
)
use_role = ImplicitRoleField( use_role = ImplicitRoleField(
parent_role=['owner_role'] parent_role=['owner_role']
) )
read_role = ImplicitRoleField( read_role = ImplicitRoleField(parent_role=[
parent_role=[ 'singleton:' + ROLE_SINGLETON_SYSTEM_AUDITOR,
'use_role', 'auditor_role', 'owner_role' 'use_role',
], 'owner_role'
) ])
@property @property
def needs_ssh_password(self): def needs_ssh_password(self):

40
awx/main/models/inventory.py
View File

@@ -99,24 +99,25 @@ class Inventory(CommonModel, ResourceMixin):
admin_role = ImplicitRoleField( admin_role = ImplicitRoleField(
parent_role='organization.admin_role', parent_role='organization.admin_role',
) )
auditor_role = ImplicitRoleField(
parent_role='organization.auditor_role',
)
update_role = ImplicitRoleField( update_role = ImplicitRoleField(
parent_role=['admin_role'], parent_role='admin_role',
) )
use_role = ImplicitRoleField( use_role = ImplicitRoleField(
parent_role=['admin_role'], parent_role='admin_role',
) )
adhoc_role = ImplicitRoleField( adhoc_role = ImplicitRoleField(
parent_role=['admin_role'], parent_role='admin_role',
) )
execute_role = ImplicitRoleField( execute_role = ImplicitRoleField(
parent_role='adhoc_role', parent_role='adhoc_role',
) )
read_role = ImplicitRoleField( read_role = ImplicitRoleField(parent_role=[
parent_role=['auditor_role', 'execute_role', 'update_role', 'use_role', 'admin_role'], 'organization.auditor_role',
) 'execute_role',
'update_role',
'use_role',
'admin_role',
])
def get_absolute_url(self): def get_absolute_url(self):
return reverse('api:inventory_detail', args=(self.pk,)) return reverse('api:inventory_detail', args=(self.pk,))
@@ -519,9 +520,6 @@ class Group(CommonModelNameNotUnique, ResourceMixin):
admin_role = ImplicitRoleField( admin_role = ImplicitRoleField(
parent_role=['inventory.admin_role', 'parents.admin_role'], parent_role=['inventory.admin_role', 'parents.admin_role'],
) )
auditor_role = ImplicitRoleField(
parent_role=['inventory.auditor_role', 'parents.auditor_role'],
)
update_role = ImplicitRoleField( update_role = ImplicitRoleField(
parent_role=['inventory.update_role', 'parents.update_role', 'admin_role'], parent_role=['inventory.update_role', 'parents.update_role', 'admin_role'],
) )
@@ -531,9 +529,13 @@ class Group(CommonModelNameNotUnique, ResourceMixin):
execute_role = ImplicitRoleField( execute_role = ImplicitRoleField(
parent_role=['inventory.execute_role', 'parents.execute_role', 'adhoc_role'], parent_role=['inventory.execute_role', 'parents.execute_role', 'adhoc_role'],
) )
read_role = ImplicitRoleField( read_role = ImplicitRoleField(parent_role=[
parent_role=['execute_role', 'update_role', 'auditor_role', 'admin_role'], 'inventory.read_role',
) 'parents.read_role',
'execute_role',
'update_role',
'admin_role'
])
def __unicode__(self): def __unicode__(self):
return self.name return self.name
@@ -1307,14 +1309,8 @@ class CustomInventoryScript(CommonModelNameNotUnique, ResourceMixin):
admin_role = ImplicitRoleField( admin_role = ImplicitRoleField(
parent_role='organization.admin_role', parent_role='organization.admin_role',
) )
member_role = ImplicitRoleField(
parent_role='organization.member_role',
)
auditor_role = ImplicitRoleField(
parent_role='organization.auditor_role',
)
read_role = ImplicitRoleField( read_role = ImplicitRoleField(
parent_role=['auditor_role', 'member_role', 'admin_role'], parent_role=['organization.auditor_role', 'organization.member_role', 'admin_role'],
) )
def get_absolute_url(self): def get_absolute_url(self):

5
awx/main/models/jobs.py
View File

@@ -223,14 +223,11 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, ResourceMixin):
admin_role = ImplicitRoleField( admin_role = ImplicitRoleField(
parent_role=[('project.admin_role', 'inventory.admin_role')] parent_role=[('project.admin_role', 'inventory.admin_role')]
) )
auditor_role = ImplicitRoleField(
parent_role=[('project.auditor_role', 'inventory.auditor_role')]
)
execute_role = ImplicitRoleField( execute_role = ImplicitRoleField(
parent_role=['admin_role'], parent_role=['admin_role'],
) )
read_role = ImplicitRoleField( read_role = ImplicitRoleField(
parent_role=['execute_role', 'auditor_role', 'admin_role'], parent_role=[('project.organization.auditor_role', 'inventory.organization.auditor_role'), 'execute_role', 'admin_role'],
) )
@classmethod @classmethod

5
awx/main/models/organization.py
View File

@@ -104,12 +104,9 @@ class Team(CommonModelNameNotUnique, ResourceMixin):
admin_role = ImplicitRoleField( admin_role = ImplicitRoleField(
parent_role='organization.admin_role', parent_role='organization.admin_role',
) )
auditor_role = ImplicitRoleField(
parent_role='organization.auditor_role',
)
member_role = ImplicitRoleField() member_role = ImplicitRoleField()
read_role = ImplicitRoleField( read_role = ImplicitRoleField(
parent_role=['admin_role', 'auditor_role', 'member_role'], parent_role=['admin_role', 'organization.auditor_role', 'member_role'],
) )
def get_absolute_url(self): def get_absolute_url(self):

33
awx/main/models/projects.py
View File

@@ -220,27 +220,26 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
default=0, default=0,
blank=True, blank=True,
) )
admin_role = ImplicitRoleField(
parent_role=[ admin_role = ImplicitRoleField(parent_role=[
'organization.admin_role', 'organization.admin_role',
'singleton:' + ROLE_SINGLETON_SYSTEM_ADMINISTRATOR, 'singleton:' + ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
], ])
)
auditor_role = ImplicitRoleField( use_role = ImplicitRoleField(
parent_role=[
'organization.auditor_role',
'singleton:' + ROLE_SINGLETON_SYSTEM_AUDITOR,
],
)
member_role = ImplicitRoleField(
parent_role='admin_role', parent_role='admin_role',
) )
scm_update_role = ImplicitRoleField(
update_role = ImplicitRoleField(
parent_role='admin_role', parent_role='admin_role',
) )
read_role = ImplicitRoleField(
parent_role=['member_role', 'auditor_role', 'scm_update_role'], read_role = ImplicitRoleField(parent_role=[
) 'organization.auditor_role',
'singleton:' + ROLE_SINGLETON_SYSTEM_AUDITOR,
'use_role',
'update_role',
])
@classmethod @classmethod
def _get_unified_job_class(cls): def _get_unified_job_class(cls):