Merge pull request #2787 from AlanCoding/2733_credential_org_access

Processing of "organization" related field in credential can_change
This commit is contained in:
Alan Rominger
2016-07-06 15:43:17 -04:00
committed by GitHub
3 changed files with 57 additions and 8 deletions
+14 -4
View File
@@ -611,10 +611,20 @@ class CredentialAccess(BaseAccess):
@check_superuser
def can_change(self, obj, data):
if data is not None:
keys = data.keys()
if 'user' in keys or 'team' in keys or 'organization' in keys:
if not self.can_add(data):
if not obj:
return False
# Check access to organizations
organization_pk = get_pk_from_dict(data, 'organization')
if data and 'organization' in data and organization_pk != getattr(obj, 'organization_id', None):
if organization_pk:
# admin permission to destination organization is mandatory
new_organization_obj = get_object_or_400(Organization, pk=organization_pk)
if self.user not in new_organization_obj.admin_role:
return False
# admin permission to existing organization is also mandatory
if obj.organization:
if self.user not in obj.organization.admin_role:
return False
if obj.organization: