External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 05:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2222 from wwitzel3/release_3.0.0

Browse Source 
CredentialAccess should check for the owner_role earlier
This commit is contained in:
Wayne Witzel III
2016-06-08 06:11:07 -07:00
parent 8319877a43 1fb4a68047
commit 61fb16b8c1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/access.py
View File

@@ -586,6 +586,7 @@ class CredentialAccess(BaseAccess):
if organization_pk: if organization_pk:
organization_obj = get_object_or_400(Organization, pk=organization_pk) organization_obj = get_object_or_400(Organization, pk=organization_pk)
return check_user_access(self.user, Organization, 'change', organization_obj, None) return check_user_access(self.user, Organization, 'change', organization_obj, None)
return False return False
@@ -595,9 +596,9 @@ class CredentialAccess(BaseAccess):
@check_superuser @check_superuser
def can_change(self, obj, data): def can_change(self, obj, data):
if not self.can_add(data): if self.user in obj.owner_role:
return False return True
return self.user in obj.owner_role return self.can_add(data)
def can_delete(self, obj): def can_delete(self, obj):
# Unassociated credentials may be marked deleted by anyone, though we # Unassociated credentials may be marked deleted by anyone, though we