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

Update timeout implementation, placeholder code for possible websocket support

Browse Source
This commit is contained in:
beeankha
2019-08-07 16:40:09 -04:00
committed by Ryan Petrello
parent 8c17990750
commit 544a5063f3
6 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/models/workflow.py
View File

@@ -632,7 +632,7 @@ class WorkflowApprovalTemplate(UnifiedJobTemplate):
@classmethod
def _get_unified_job_field_names(cls):
return ['name', 'description']
return ['name', 'description', 'timeout']
def get_absolute_url(self, request=None):
return reverse('api:workflow_approval_template_detail', kwargs={'pk': self.pk}, request=request)
@@ -650,6 +650,11 @@ class WorkflowApproval(UnifiedJob):
default=None,
on_delete=models.SET_NULL,
)
timeout = models.IntegerField(
blank=True,
default=0,
help_text=_("The amount of time (in seconds) before the approval node expires and fails."),
)
@classmethod
def _get_unified_job_template_class(cls):
@@ -676,3 +681,9 @@ class WorkflowApproval(UnifiedJob):
self.save()
schedule_task_manager()
return reverse('api:workflow_approval_deny', kwargs={'pk': self.pk}, request=request)
# &&&&&& Possible placeholder for websocket support
# def websocket_emit_data(self):
# websocket_data = super(WorkflowApproval, self).websocket_emit_data()
# websocket_data.update(dict(project_id=self.project.id)) # ?????
# return websocket_data