From 73b2105a301a01d57ead9b7fbeff01cb08ae525d Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Mon, 22 Feb 2016 16:27:11 -0500 Subject: [PATCH] Switch to using const's for system admin / system auditor singleton names --- awx/main/models/organization.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/models/organization.py b/awx/main/models/organization.py index b08f068060..0cd50d9dcc 100644 --- a/awx/main/models/organization.py +++ b/awx/main/models/organization.py @@ -18,6 +18,7 @@ from django.utils.translation import ugettext_lazy as _ # AWX from awx.main.fields import AutoOneToOneField, ImplicitRoleField from awx.main.models.base import * # noqa +from awx.main.models.rbac import ROLE_SINGLETON_SYSTEM_ADMINISTRATOR, ROLE_SINGLETON_SYSTEM_AUDITOR from awx.main.models.mixins import ResourceMixin from awx.main.conf import tower_settings @@ -50,12 +51,12 @@ class Organization(CommonModel, ResourceMixin): ) admin_role = ImplicitRoleField( role_name='Organization Administrator', - parent_role='singleton:System Administrator', + parent_role='singleton:' + ROLE_SINGLETON_SYSTEM_ADMINISTRATOR, permissions = {'all': True} ) auditor_role = ImplicitRoleField( role_name='Organization Auditor', - parent_role='singleton:System Auditor', + parent_role='singleton:' + ROLE_SINGLETON_SYSTEM_AUDITOR, permissions = {'read': True} ) member_role = ImplicitRoleField(