mirror of
https://github.com/ansible/awx.git
synced 2026-03-29 06:45:09 -02:30
Enable deletion of orphaned approval nodes
Update serializer to include workflow approval for activity stream
This commit is contained in:
@@ -3456,13 +3456,13 @@ class WorkflowApprovalTemplateSerializer(UnifiedJobTemplateSerializer):
|
||||
return res
|
||||
|
||||
|
||||
# class WorkflowJobTemplateApprovalSerializer(UnifiedJobTemplateSerializer):
|
||||
# class Meta:
|
||||
# model = WorkflowJobTemplateApproval
|
||||
# fields = ('*',)
|
||||
#
|
||||
# def post(self, obj):
|
||||
# return # POST only!!!
|
||||
class WorkflowJobTemplateApprovalSerializer(UnifiedJobTemplateSerializer):
|
||||
class Meta:
|
||||
model = WorkflowApprovalTemplate
|
||||
fields = ('*',)
|
||||
|
||||
def post(self, obj):
|
||||
return # POST only!!!
|
||||
|
||||
|
||||
class LaunchConfigurationBaseSerializer(BaseSerializer):
|
||||
@@ -4746,7 +4746,8 @@ class ActivityStreamSerializer(BaseSerializer):
|
||||
('o_auth2_access_token', ('id', 'user_id', 'description', 'application_id', 'scope')),
|
||||
('o_auth2_application', ('id', 'name', 'description')),
|
||||
('credential_type', ('id', 'name', 'description', 'kind', 'managed_by_tower')),
|
||||
('ad_hoc_command', ('id', 'name', 'status', 'limit'))
|
||||
('ad_hoc_command', ('id', 'name', 'status', 'limit')),
|
||||
('workflow_approval', ('id', 'unified_job_id')),
|
||||
]
|
||||
return field_list
|
||||
|
||||
@@ -4855,6 +4856,7 @@ class ActivityStreamSerializer(BaseSerializer):
|
||||
def _summarize_parent_ujt(self, obj, fk, summary_fields):
|
||||
summary_keys = {'job': 'job_template',
|
||||
'workflow_job_template_node': 'workflow_job_template',
|
||||
'workflow_approval': 'workflow_approval_template',
|
||||
'schedule': 'unified_job_template'}
|
||||
if fk not in summary_keys:
|
||||
return
|
||||
|
||||
@@ -839,8 +839,6 @@ class SystemJobEventsList(SubListAPIView):
|
||||
return super(SystemJobEventsList, self).finalize_response(request, response, *args, **kwargs)
|
||||
|
||||
|
||||
|
||||
|
||||
class ProjectUpdateCancel(RetrieveAPIView):
|
||||
|
||||
model = models.ProjectUpdate
|
||||
|
||||
Reference in New Issue
Block a user