mirror of
https://github.com/ansible/awx.git
synced 2026-05-17 22:37:41 -02:30
Clean up redundancies
This commit is contained in:
@@ -3405,7 +3405,7 @@ class WorkflowApprovalSerializer(UnifiedJobSerializer):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = WorkflowApproval
|
model = WorkflowApproval
|
||||||
fields = ('*', 'result_stdout', '-controller_node', '-execution_node',)
|
fields = ('*', '-controller_node', '-execution_node',)
|
||||||
|
|
||||||
def get_related(self, obj):
|
def get_related(self, obj):
|
||||||
res = super(WorkflowApprovalSerializer, self).get_related(obj)
|
res = super(WorkflowApprovalSerializer, self).get_related(obj)
|
||||||
@@ -3416,9 +3416,6 @@ class WorkflowApprovalSerializer(UnifiedJobSerializer):
|
|||||||
res['notifications'] = self.reverse('api:workflow_approval_notifications_list', kwargs={'pk': obj.pk})
|
res['notifications'] = self.reverse('api:workflow_approval_notifications_list', kwargs={'pk': obj.pk})
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def get_result_stdout(self, obj):
|
|
||||||
return obj.result_stdout
|
|
||||||
|
|
||||||
|
|
||||||
class WorkflowApprovalListSerializer(WorkflowApprovalSerializer, UnifiedJobListSerializer):
|
class WorkflowApprovalListSerializer(WorkflowApprovalSerializer, UnifiedJobListSerializer):
|
||||||
|
|
||||||
|
|||||||
@@ -4446,26 +4446,6 @@ class WorkflowApprovalTemplateNotificationTemplatesSuccessList(WorkflowApprovalT
|
|||||||
relationship = 'notification_templates_success'
|
relationship = 'notification_templates_success'
|
||||||
|
|
||||||
|
|
||||||
class WorkflowApprovalTemplateLaunch(GenericAPIView):
|
|
||||||
|
|
||||||
model = models.WorkflowApprovalTemplate
|
|
||||||
obj_permission_type = 'start'
|
|
||||||
serializer_class = serializers.EmptySerializer
|
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
|
||||||
return Response({})
|
|
||||||
|
|
||||||
def post(self, request, *args, **kwargs):
|
|
||||||
obj = self.get_object()
|
|
||||||
new_job = obj.create_unified_job(extra_vars=request.data.get('extra_vars', {}))
|
|
||||||
new_job.signal_start()
|
|
||||||
data = OrderedDict()
|
|
||||||
data['workflow_approval'] = new_job.id
|
|
||||||
data.update(serializers.WorkflowApprovalSerializer(new_job, context=self.get_serializer_context()).to_representation(new_job))
|
|
||||||
headers = {'Location': new_job.get_absolute_url(request)}
|
|
||||||
return Response(data, status=status.HTTP_201_CREATED, headers=headers)
|
|
||||||
|
|
||||||
|
|
||||||
class WorkflowApprovalTemplateJobsList(SubListAPIView):
|
class WorkflowApprovalTemplateJobsList(SubListAPIView):
|
||||||
|
|
||||||
model = models.WorkflowApproval
|
model = models.WorkflowApproval
|
||||||
|
|||||||
Reference in New Issue
Block a user