From 5f82754a3f5150d8bcebed6e28b98790d5ef0064 Mon Sep 17 00:00:00 2001
From: beeankha <beeankha@gmail.com>
Date: Thu, 1 Aug 2019 16:57:44 -0400
Subject: [PATCH] Clean up RBAC code

---
 awx/api/serializers.py             | 4 +---
 awx/api/views/__init__.py          | 2 --
 awx/main/scheduler/task_manager.py | 4 ----
 awx/main/signals.py                | 8 +-------
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index e494181603..16f2e70505 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -3455,9 +3455,7 @@ class WorkflowApprovalTemplateSerializer(UnifiedJobTemplateSerializer):
         if 'last_job' in res:
             del res['last_job']
 
-        res.update(dict(
-            jobs = self.reverse('api:workflow_approval_template_jobs_list', kwargs={'pk': obj.pk}),
-            ))
+        res.update(dict(jobs = self.reverse('api:workflow_approval_template_jobs_list', kwargs={'pk': obj.pk}),))
         return res
 
 
diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index 2215c14daa..6d3aa52af7 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -4453,7 +4453,6 @@ class WorkflowApprovalApprove(RetrieveAPIView):
     model = models.WorkflowApproval
     serializer_class = serializers.WorkflowApprovalViewSerializer
 
-    # &&&&&& Changed per the PR review, notes/questions in additional comments...
     def post(self, request, *args, **kwargs):
         obj = self.get_object()
         request.user.can_access(models.WorkflowApproval, 'approve_or_deny', obj)
@@ -4467,7 +4466,6 @@ class WorkflowApprovalDeny(RetrieveAPIView):
     model = models.WorkflowApproval
     serializer_class = serializers.WorkflowApprovalViewSerializer
 
-    # &&&&&& Changed per the PR review, notes/questions in additional comments...
     def post(self, request, *args, **kwargs):
         obj = self.get_object()
         request.user.can_access(models.WorkflowApproval, 'approve_or_deny', obj)
diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py
index 3d8b6d1734..b79abbad0d 100644
--- a/awx/main/scheduler/task_manager.py
+++ b/awx/main/scheduler/task_manager.py
@@ -482,10 +482,6 @@ class TaskManager():
             found_acceptable_queue = False
             idle_instance_that_fits = None
             if isinstance(task, WorkflowJob):
-                # &&&&&& Timeout implementation (pseudo-code)
-                # if (tz_now() - task.created).seconds > the_timeout_in_seconds:
-                #     logger.error('meaning log message')
-                #     mark it as status failed and set a reasonable `job_explanation` value
                 if task.unified_job_template_id in running_workflow_templates:
                     if not task.allow_simultaneous:
                         logger.debug("{} is blocked from running, workflow already running".format(task.log_format))
diff --git a/awx/main/signals.py b/awx/main/signals.py
index 522aa1b248..627711f530 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -35,7 +35,7 @@ from awx.main.models import (
     JobTemplate, OAuth2AccessToken, Organization, Project, ProjectUpdateEvent,
     Role, SystemJob, SystemJobEvent, SystemJobTemplate, UnifiedJob,
     UnifiedJobTemplate, User, UserSessionMembership, WorkflowJobTemplateNode,
-    WorkflowApprovalTemplate, ROLE_SINGLETON_SYSTEM_ADMINISTRATOR
+    WorkflowApproval, WorkflowApprovalTemplate, ROLE_SINGLETON_SYSTEM_ADMINISTRATOR
 )
 from awx.main.constants import CENSOR_VALUE
 from awx.main.utils import model_instance_diff, model_to_dict, camelcase_to_underscore, get_current_apps
@@ -505,10 +505,6 @@ def activity_stream_update(sender, instance, **kwargs):
     else:
         activity_entry.setting = conf_to_dict(instance)
         activity_entry.save()
-    # &&&&&&
-    # for approvals in kwargs['pk_set']:
-    #     if isinstance(WorkflowApprovalTemplate) or isinstance(kwargs['model'].objects.filter(id=approvals), WorkflowApprovalTemplate):
-    #         continue
 
 
 def activity_stream_delete(sender, instance, **kwargs):
@@ -650,7 +646,6 @@ def delete_approval_templates(sender, instance, **kwargs):
         instance.unified_job_template.delete()
 
 
-# When setting UJT to anything other than "is approval node" - delete this comment!
 @receiver(pre_save, sender=WorkflowJobTemplateNode)
 def delete_approval_node_type_change(sender, instance, **kwargs):
     try:
@@ -663,7 +658,6 @@ def delete_approval_node_type_change(sender, instance, **kwargs):
         old.unified_job_template.delete()
 
 
-# &&&&&& New stuff to test!
 @receiver(post_delete, sender=WorkflowApprovalTemplate)
 def deny_orphaned_approvals(sender, instance, **kwargs):
     for approval in WorkflowApproval.objects.filter(workflow_approval_template=instance, status='pending'):