Fix imports, __all__ definition, organization/team sublists under projects.

This commit is contained in:
Chris Church
2013-07-20 19:59:53 -04:00
parent a6c767907e
commit 6fda31e790
8 changed files with 36 additions and 34 deletions

View File

@@ -33,9 +33,11 @@ from djcelery.models import TaskMeta
# Django-REST-Framework
from rest_framework.authtoken.models import Token
__all__ = ['Organization', 'Team', 'Project', 'Credential', 'Inventory',
'Host', 'Group', 'Permission', 'JobTemplate', 'Job',
'JobHostSummary', 'JobEvent']
__all__ = ['PrimordialModel', 'Organization', 'Team', 'Project', 'Credential',
'Inventory', 'Host', 'Group', 'Permission', 'JobTemplate', 'Job',
'JobHostSummary', 'JobEvent', 'PERM_INVENTORY_ADMIN',
'PERM_INVENTORY_READ', 'PERM_INVENTORY_WRITE',
'PERM_INVENTORY_DEPLOY', 'PERM_INVENTORY_CHECK']
# TODO: reporting model TBD
@@ -50,29 +52,6 @@ JOB_TYPE_CHOICES = [
(PERM_INVENTORY_CHECK, _('Check')),
]
PERMISSION_TYPES = [
PERM_INVENTORY_ADMIN,
PERM_INVENTORY_READ,
PERM_INVENTORY_WRITE,
PERM_INVENTORY_DEPLOY,
PERM_INVENTORY_CHECK,
]
PERMISSION_TYPES_ALLOWING_INVENTORY_READ = [
PERM_INVENTORY_ADMIN,
PERM_INVENTORY_WRITE,
PERM_INVENTORY_READ,
]
PERMISSION_TYPES_ALLOWING_INVENTORY_WRITE = [
PERM_INVENTORY_ADMIN,
PERM_INVENTORY_WRITE,
]
PERMISSION_TYPES_ALLOWING_INVENTORY_ADMIN = [
PERM_INVENTORY_ADMIN,
]
# FIXME: TODO: make sure all of these are used and consistent
PERMISSION_TYPE_CHOICES = [
(PERM_INVENTORY_READ, _('Read Inventory')),