Add more RBAC, filter out AJT/AJs from unified jobs lists

Comment out placeholder in serializer
This commit is contained in:
beeankha
2019-07-24 14:30:20 -04:00
committed by Ryan Petrello
parent 453e142635
commit 64c94d478d
11 changed files with 31 additions and 81 deletions

View File

@@ -23,7 +23,6 @@ from awx.main.models import (
Project,
ProjectUpdate,
SystemJob,
# &&&&&& WorkflowApproval,
WorkflowJob,
WorkflowJobTemplate
)
@@ -239,11 +238,6 @@ class TaskManager():
task.send_notification_templates('running')
logger.debug('Transitioning %s to running status.', task.log_format)
schedule_task_manager()
# elif type(task) is WorkflowApproval: (&&&&&& placeholder for notification work)
# task.status = 'pending'
# task.send_notification_templates('pending')
# logger.debug('Transitioning %s to pending status.', task.log_format)
# schedule_task_manager()
elif not task.supports_isolation() and rampart_group.controller_id:
# non-Ansible jobs on isolated instances run on controller
task.instance_group = rampart_group.controller