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

fix a few nits w/ workflow approval activity stream records

Browse Source
This commit is contained in:
Ryan Petrello
2019-08-09 15:34:16 -04:00
parent d9f3fed06f
commit 4a75edf549
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,12 +683,14 @@ class WorkflowApproval(UnifiedJob):
self.save()
changes = model_to_dict(self, model_serializer_mapping())
changes['status']=['pending', 'successful']
ActivityStream(
activity_entry = ActivityStream(
operation='update',
object1='workflow_approval',
actor=request.user,
changes=json.dumps(changes),
).save()
)
activity_entry.save()
getattr(activity_entry, 'workflow_approval').add(self.pk)
schedule_task_manager()
return reverse('api:workflow_approval_approve', kwargs={'pk': self.pk}, request=request)
@@ -698,11 +700,17 @@ class WorkflowApproval(UnifiedJob):
self.save()
changes = model_to_dict(self, model_serializer_mapping())
changes['status']=['pending', 'failed']
ActivityStream(
activity_entry = ActivityStream(
operation='update',
object1='workflow_approval',
actor=request.user,
changes=json.dumps(changes),
).save()
)
activity_entry.save()
getattr(activity_entry, 'workflow_approval').add(self.pk)
schedule_task_manager()
return reverse('api:workflow_approval_deny', kwargs={'pk': self.pk}, request=request)
@property
def workflow_job_template(self):
return self.unified_job_node.workflow_job.unified_job_template