External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-23 22:16:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3800 from AlanCoding/event_children_list

Browse Source 
Populate event children list via parent_uuid

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-05-02 00:37:03 +00:00
committed by GitHub
parent f3c023a11f 530a7ba51d
commit 5ab7f888f1
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/serializers.py
View File

@@ -4124,8 +4124,7 @@ class JobEventSerializer(BaseSerializer):
)) ))
if obj.parent_id: if obj.parent_id:
res['parent'] = self.reverse('api:job_event_detail', kwargs={'pk': obj.parent_id}) res['parent'] = self.reverse('api:job_event_detail', kwargs={'pk': obj.parent_id})
if obj.children.exists(): res['children'] = self.reverse('api:job_event_children_list', kwargs={'pk': obj.pk})
res['children'] = self.reverse('api:job_event_children_list', kwargs={'pk': obj.pk})
if obj.host_id: if obj.host_id:
res['host'] = self.reverse('api:host_detail', kwargs={'pk': obj.host_id}) res['host'] = self.reverse('api:host_detail', kwargs={'pk': obj.host_id})
if obj.hosts.exists(): if obj.hosts.exists():

6
awx/api/views/__init__.py
View File

@@ -3864,6 +3864,12 @@ class JobEventChildrenList(SubListAPIView):
view_name = _('Job Event Children List') view_name = _('Job Event Children List')
search_fields = ('stdout',) search_fields = ('stdout',)
def get_queryset(self):
parent_event = self.get_parent_object()
self.check_parent_access(parent_event)
qs = self.request.user.get_queryset(self.model).filter(parent_uuid=parent_event.uuid)
return qs
class JobEventHostsList(HostRelatedSearchMixin, SubListAPIView): class JobEventHostsList(HostRelatedSearchMixin, SubListAPIView):

2
awx/main/access.py
View File

@@ -2264,7 +2264,7 @@ class JobEventAccess(BaseAccess):
''' '''
model = JobEvent model = JobEvent
prefetch_related = ('hosts', 'children', 'job__job_template', 'host',) prefetch_related = ('hosts', 'job__job_template', 'host',)
def filtered_queryset(self): def filtered_queryset(self):
return self.model.objects.filter( return self.model.objects.filter(