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

add workflow to unified endpoints

Browse Source
This commit is contained in:
Chris Meyers
2016-09-02 09:04:49 -04:00
parent 39ac2c047b
commit 83c5b3323f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/serializers.py
View File

@@ -513,7 +513,7 @@ class UnifiedJobTemplateSerializer(BaseSerializer):
def get_types(self): def get_types(self):
if type(self) is UnifiedJobTemplateSerializer: if type(self) is UnifiedJobTemplateSerializer:
return ['project', 'inventory_source', 'job_template', 'system_job_template'] return ['project', 'inventory_source', 'job_template', 'system_job_template', 'workflow_job_template',]
else: else:
return super(UnifiedJobTemplateSerializer, self).get_types() return super(UnifiedJobTemplateSerializer, self).get_types()
@@ -528,7 +528,7 @@ class UnifiedJobTemplateSerializer(BaseSerializer):
serializer_class = JobTemplateSerializer serializer_class = JobTemplateSerializer
elif isinstance(obj, SystemJobTemplate): elif isinstance(obj, SystemJobTemplate):
serializer_class = SystemJobTemplateSerializer serializer_class = SystemJobTemplateSerializer
elif isinstance(obj, WorkflowJobTemplateSerializer): elif isinstance(obj, WorkflowJobTemplate):
serializer_class = WorkflowJobTemplateSerializer serializer_class = WorkflowJobTemplateSerializer
if serializer_class: if serializer_class:
serializer = serializer_class(instance=obj, context=self.context) serializer = serializer_class(instance=obj, context=self.context)
@@ -560,7 +560,7 @@ class UnifiedJobSerializer(BaseSerializer):
def get_types(self): def get_types(self):
if type(self) is UnifiedJobSerializer: if type(self) is UnifiedJobSerializer:
return ['project_update', 'inventory_update', 'job', 'ad_hoc_command', 'system_job'] return ['project_update', 'inventory_update', 'job', 'ad_hoc_command', 'system_job', 'workflow_job',]
else: else:
return super(UnifiedJobSerializer, self).get_types() return super(UnifiedJobSerializer, self).get_types()
@@ -593,6 +593,8 @@ class UnifiedJobSerializer(BaseSerializer):
serializer_class = AdHocCommandSerializer serializer_class = AdHocCommandSerializer
elif isinstance(obj, SystemJob): elif isinstance(obj, SystemJob):
serializer_class = SystemJobSerializer serializer_class = SystemJobSerializer
elif isinstance(obj, WorkflowJob):
serializer_class = WorkflowJobSerializer
if serializer_class: if serializer_class:
serializer = serializer_class(instance=obj, context=self.context) serializer = serializer_class(instance=obj, context=self.context)
ret = serializer.to_representation(obj) ret = serializer.to_representation(obj)
@@ -640,6 +642,8 @@ class UnifiedJobListSerializer(UnifiedJobSerializer):
serializer_class = AdHocCommandListSerializer serializer_class = AdHocCommandListSerializer
elif isinstance(obj, SystemJob): elif isinstance(obj, SystemJob):
serializer_class = SystemJobListSerializer serializer_class = SystemJobListSerializer
elif isinstance(obj, WorkflowJob):
serializer_class = WorkflowJobSerializer
if serializer_class: if serializer_class:
serializer = serializer_class(instance=obj, context=self.context) serializer = serializer_class(instance=obj, context=self.context)
ret = serializer.to_representation(obj) ret = serializer.to_representation(obj)

8
awx/main/access.py
View File

@@ -1431,10 +1431,12 @@ class UnifiedJobTemplateAccess(BaseAccess):
inventory_source_qs = self.user.get_queryset(InventorySource).filter(source__in=CLOUD_INVENTORY_SOURCES) inventory_source_qs = self.user.get_queryset(InventorySource).filter(source__in=CLOUD_INVENTORY_SOURCES)
job_template_qs = self.user.get_queryset(JobTemplate) job_template_qs = self.user.get_queryset(JobTemplate)
system_job_template_qs = self.user.get_queryset(SystemJobTemplate) system_job_template_qs = self.user.get_queryset(SystemJobTemplate)
workflow_job_template_qs = self.user.get_queryset(WorkflowJobTemplate)
qs = qs.filter(Q(Project___in=project_qs) | qs = qs.filter(Q(Project___in=project_qs) |
Q(InventorySource___in=inventory_source_qs) | Q(InventorySource___in=inventory_source_qs) |
Q(JobTemplate___in=job_template_qs) | Q(JobTemplate___in=job_template_qs) |
Q(systemjobtemplate__in=system_job_template_qs)) Q(systemjobtemplate__in=system_job_template_qs) |
Q(workflowjobtemplate__in=workflow_job_template_qs))
qs = qs.select_related( qs = qs.select_related(
'created_by', 'created_by',
'modified_by', 'modified_by',
@@ -1470,11 +1472,13 @@ class UnifiedJobAccess(BaseAccess):
job_qs = self.user.get_queryset(Job) job_qs = self.user.get_queryset(Job)
ad_hoc_command_qs = self.user.get_queryset(AdHocCommand) ad_hoc_command_qs = self.user.get_queryset(AdHocCommand)
system_job_qs = self.user.get_queryset(SystemJob) system_job_qs = self.user.get_queryset(SystemJob)
workflow_job_qs = self.user.get_queryset(WorkflowJob)
qs = qs.filter(Q(ProjectUpdate___in=project_update_qs) | qs = qs.filter(Q(ProjectUpdate___in=project_update_qs) |
Q(InventoryUpdate___in=inventory_update_qs) | Q(InventoryUpdate___in=inventory_update_qs) |
Q(Job___in=job_qs) | Q(Job___in=job_qs) |
Q(AdHocCommand___in=ad_hoc_command_qs) | Q(AdHocCommand___in=ad_hoc_command_qs) |
Q(SystemJob___in=system_job_qs)) Q(SystemJob___in=system_job_qs) |
Q(WorkflowJob___in=workflow_job_qs))
qs = qs.select_related( qs = qs.select_related(
'created_by', 'created_by',
'modified_by', 'modified_by',