External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-05 19:38:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove source_workflow_job and use workflow_job_id instead.

Browse Source
This commit is contained in:
Aaron Tan
2016-11-29 11:51:42 -05:00
parent 3e8e9480d1
commit a458bb3c89
6 changed files with 17 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/generics.py
View File

@@ -241,7 +241,10 @@ class ListAPIView(generics.ListAPIView, GenericAPIView):
# Base class for a read-only list view.
def get_queryset(self):
return self.request.user.get_queryset(self.model)
qs = self.request.user.get_queryset(self.model)
if getattr(self.model, 'spawned_by_workflow', False):
qs = qs.select_related('unified_job_node__workflow_job')
return qs
def paginate_queryset(self, queryset):
page = super(ListAPIView, self).paginate_queryset(queryset)

6
awx/api/serializers.py
View File

@@ -566,7 +566,7 @@ class UnifiedJobSerializer(BaseSerializer):
fields = ('*', 'unified_job_template', 'launch_type', 'status',
'failed', 'started', 'finished', 'elapsed', 'job_args',
'job_cwd', 'job_env', 'job_explanation', 'result_stdout',
'execution_node', 'result_traceback', 'source_workflow_job')
'execution_node', 'result_traceback', 'workflow_job_id')
extra_kwargs = {
'unified_job_template': {
'source': 'unified_job_template_id',
@@ -598,8 +598,8 @@ class UnifiedJobSerializer(BaseSerializer):
res['stdout'] = reverse('api:job_stdout', args=(obj.pk,))
elif isinstance(obj, AdHocCommand):
res['stdout'] = reverse('api:ad_hoc_command_stdout', args=(obj.pk,))
if obj.source_workflow_job:
res['source_workflow_job'] = reverse('api:workflow_job_detail', args=(obj.source_workflow_job.pk,))
if obj.workflow_job_id:
res['source_worklflow_job'] = reverse('api:workflow_job_detail', args=(obj.workflow_job_id,))
return res
def to_representation(self, obj):