External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 01:47:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where non-org-admin users with appropriate job template

Browse Source 
permissions were not able to view or edit schedule details
This commit is contained in:
Matthew Jones
2015-01-21 13:49:04 -05:00
parent 556d7a8ac6
commit 16a9af0803
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/access.py
View File

@@ -1318,8 +1318,8 @@ class ScheduleAccess(BaseAccess):
if self.user.is_superuser: if self.user.is_superuser:
return True return True
if obj and obj.unified_job_template: if obj and obj.unified_job_template:
job_class = obj.unified_job_template._get_unified_job_class() job_class = obj.unified_job_template
return self.user.can_access(job_class, 'read', obj.unified_job_template) return self.user.can_access(type(job_class), 'read', obj.unified_job_template)
else: else:
return False return False
@@ -1338,7 +1338,7 @@ class ScheduleAccess(BaseAccess):
return True return True
if obj and obj.unified_job_template: if obj and obj.unified_job_template:
job_class = obj.unified_job_template job_class = obj.unified_job_template
return self.user.can_access(type(job_class), 'change', job_class, data) return self.user.can_access(type(job_class), 'change', job_class, None)
else: else:
return False return False

1
awx/main/tests/schedules.py
View File

@@ -180,6 +180,7 @@ class ScheduleTest(BaseTest):
with self.current_user(self.normal_django_user): with self.current_user(self.normal_django_user):
data = self.put(new_schedule_url, data=data, expect=200) data = self.put(new_schedule_url, data=data, expect=200)
self.assertNotEqual(data['next_run'], None) self.assertNotEqual(data['next_run'], None)
#TODO: Test path needed for non org-admin users, but rather regular users who have permission to create the JT associated with the Schedule
def test_infinite_schedule(self): def test_infinite_schedule(self):
first_url = reverse('api:inventory_source_schedules_list', args=(self.first_inventory_source.pk,)) first_url = reverse('api:inventory_source_schedules_list', args=(self.first_inventory_source.pk,))