shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Allow an org admin to delete project updates

Browse Source 
Only in their purview (where they can delete or change the original
project)

Plus a bonus unit test!
This commit is contained in:
Matthew Jones 2015-12-01 16:02:10 -05:00
parent f33e17826f
commit e79db58b6d
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/access.py
View File

@ -750,6 +750,9 @@ class ProjectUpdateAccess(BaseAccess):
def can_cancel(self, obj):
return self.can_change(obj, {}) and obj.can_cancel
def can_delete(self, obj):
return obj and self.user.can_access(Project, 'delete', obj.project)
class PermissionAccess(BaseAccess):
'''
I can see a permission when:

22
awx/main/tests/projects.py
View File

@ -1321,6 +1321,28 @@ class ProjectUpdatesTest(BaseTransactionTest):
with self.current_user(self.super_django_user):
self.post(projects_url, project_data, expect=201)
def test_delete_project_update_as_org_admin(self):
scm_url = getattr(settings, 'TEST_GIT_PUBLIC_HTTPS',
'https://github.com/ansible/ansible.github.com.git')
if not all([scm_url]):
self.skipTest('no public git repo defined for https!')
projects_url = reverse('api:project_list')
project_data = {
'name': 'my public git project over https',
'scm_type': 'git',
'scm_url': scm_url,
}
org = self.make_organizations(self.super_django_user, 1)[0]
org.admins.add(self.normal_django_user)
with self.current_user(self.super_django_user):
del_proj = self.post(projects_url, project_data, expect=201)
del_proj = Project.objects.get(pk=del_proj["id"])
org.projects.add(del_proj)
pu = self.check_project_update(del_proj)
pu_url = reverse('api:project_update_detail', args=(pu.id,))
self.delete(pu_url, expect=403, auth=self.get_other_credentials())
self.delete(pu_url, expect=204, auth=self.get_normal_credentials())
def test_public_git_project_over_https(self):
scm_url = getattr(settings, 'TEST_GIT_PUBLIC_HTTPS',
'https://github.com/ansible/ansible.github.com.git')