zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-05 03:21:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2425 from AlanCoding/2420_inventory_access_bug

Browse Source 
Fix bug leftover from changing JT can_add access
This commit is contained in:
Alan Rominger
2016-06-16 13:05:14 -04:00
committed by GitHub
parent aed2a60dee a0c4bb5f6f
commit 1e99f92a50
2 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/access.py
View File

@@ -816,17 +816,22 @@ class JobTemplateAccess(BaseAccess):
project_pk = get_pk_from_dict(data, 'project')
if 'job_type' in data and data['job_type'] == PERM_INVENTORY_SCAN:
org = inventory[0].organization
accessible = self.user in org.admin_role
if inventory_pk and inventory.organization:
org = inventory.organization
accessible = self.user in org.admin_role
else:
accessible = False
if not project_pk and accessible:
return True
elif not accessible:
return False
# If the user has admin access to the project (as an org admin), should
# be able to proceed without additional checks.
project = get_object_or_400(Project, pk=project_pk)
return self.user in project.use_role
if project_pk:
project = get_object_or_400(Project, pk=project_pk)
return self.user in project.use_role
else:
return False
def can_start(self, obj, validate_license=True):
# Check license.