Merge pull request #3274 from anoek/3081

Prevent private credentials from being to assigned to teams
This commit is contained in:
Akita Noek
2016-08-17 15:57:59 -04:00
committed by GitHub
9 changed files with 260 additions and 92 deletions

View File

@@ -215,11 +215,11 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
admin_role = ImplicitRoleField(
parent_role=[
'singleton:' + ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
'organization.admin_role',
],
)
use_role = ImplicitRoleField(
parent_role=[
'organization.admin_role',
'admin_role',
]
)