External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1541 from wwitzel3/devel

Browse Source 
Fix member_role parent to include credential_admin_role
This commit is contained in:
Wayne Witzel III 2018-03-13 13:52:58 -04:00 committed by GitHub
commit 4b27b05fd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0021_v330_declare_new_rbac_roles.py
View File

@ -83,6 +83,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='organization',
name='member_role',
field=awx.main.fields.ImplicitRoleField(null=b'True', on_delete=django.db.models.deletion.CASCADE, parent_role=[b'admin_role', b'project_admin_role', b'inventory_admin_role', b'workflow_admin_role', b'notification_admin_role', b'execute_role'], related_name='+', to='main.Role'),
field=awx.main.fields.ImplicitRoleField(null=b'True', on_delete=django.db.models.deletion.CASCADE, parent_role=[b'admin_role', b'project_admin_role', b'inventory_admin_role', b'workflow_admin_role', b'notification_admin_role', b'credential_admin_role', b'execute_role'], related_name='+', to='main.Role'),
),
]

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

@ -64,7 +64,7 @@ class Organization(CommonModel, NotificationFieldsModel, ResourceMixin, CustomVi
member_role = ImplicitRoleField(
parent_role=['admin_role', 'execute_role', 'project_admin_role',
'inventory_admin_role', 'workflow_admin_role',
'notification_admin_role']
'notification_admin_role', 'credential_admin_role']
)
read_role = ImplicitRoleField(
parent_role=['member_role', 'auditor_role'],