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

Merge pull request #1276 from wwitzel3/rbac

Browse Source 
Implements issue #1061, allow org admins (or higher) job delete
This commit is contained in:
Wayne Witzel III
2016-03-22 09:47:36 -04:00
parent 80560fffc9 99ca2efc4f
commit c7cb9f3a2d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -368,7 +368,7 @@ test_unit:
# Run all API unit tests with coverage enabled. # Run all API unit tests with coverage enabled.
test_coverage: test_coverage:
py.test --create-db --cov=awx --cov-report=xml --junitxml=./reports/junit.xml awx/main/tests awx/api/tests awx/fact/tests py.test --create-db --cov=awx --cov-report=xml --junitxml=./reports/junit.xml awx/main/tests awx/api/tests
# Output test coverage as HTML (into htmlcov directory). # Output test coverage as HTML (into htmlcov directory).
coverage_html: coverage_html:

5
awx/main/access.py
View File

@@ -838,7 +838,10 @@ class JobAccess(BaseAccess):
return obj.status == 'new' and self.can_read(obj) and self.can_add(data) return obj.status == 'new' and self.can_read(obj) and self.can_add(data)
def can_delete(self, obj): def can_delete(self, obj):
return self.can_read(obj) # Allow org admins and superusers to delete jobs
if self.user.is_superuser:
return True
return obj.inventory.accessible_by(self.user, ALL_PERMISSIONS)
def can_start(self, obj): def can_start(self, obj):
self.check_license() self.check_license()