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

change up a few activity stream and approval drawer issues

Browse Source
This commit is contained in:
Ryan Petrello
2019-08-15 15:52:29 -04:00
parent aac8c9fb04
commit dd89e46ee6
6 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -681,38 +681,16 @@ class WorkflowApproval(UnifiedJob):
return 'workflow_approval_template'
def approve(self, request=None):
from awx.main.signals import model_serializer_mapping # circular import
self.status = 'successful'
self.save()
self.websocket_emit_status(self.status)
changes = model_to_dict(self, model_serializer_mapping())
changes['status'] = ['pending', 'successful']
activity_entry = ActivityStream(
operation='update',
object1='workflow_approval',
actor=request.user,
changes=json.dumps(changes),
)
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)
def deny(self, request=None):
from awx.main.signals import model_serializer_mapping # circular import
self.status = 'failed'
self.save()
self.websocket_emit_status(self.status)
changes = model_to_dict(self, model_serializer_mapping())
changes['status'] = ['pending', 'failed']
activity_entry = ActivityStream(
operation='update',
object1='workflow_approval',
actor=request.user,
changes=json.dumps(changes),
)
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)