From bae3fdb63572e5de86c5c949f978a09351f62cd1 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Wed, 25 Jan 2017 09:26:05 -0500
Subject: [PATCH] removal of workflow TODOs that are resolved

---
 awx/api/views.py            | 20 ++------------------
 awx/main/models/workflow.py |  7 +------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/awx/api/views.py b/awx/api/views.py
index 579cfe37fa..0b223228e0 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -2771,7 +2771,7 @@ class WorkflowJobTemplateNodeChildrenBaseList(WorkflowsEnforcementMixin, Enforce
 
     model = WorkflowJobTemplateNode
     serializer_class = WorkflowJobTemplateNodeListSerializer
-    always_allow_superuser = True # TODO: RBAC
+    always_allow_superuser = True
     parent_model = WorkflowJobTemplateNode
     relationship = ''
     enforce_parent_relationship = 'workflow_job_template'
@@ -2869,7 +2869,6 @@ class WorkflowJobNodeAlwaysNodesList(WorkflowJobNodeChildrenBaseList):
     relationship = 'always_nodes'
 
 
-# TODO:
 class WorkflowJobTemplateList(WorkflowsEnforcementMixin, ListCreateAPIView):
 
     model = WorkflowJobTemplate
@@ -2877,18 +2876,7 @@ class WorkflowJobTemplateList(WorkflowsEnforcementMixin, ListCreateAPIView):
     always_allow_superuser = False
     new_in_310 = True
 
-    # TODO: RBAC
-    '''
-    def post(self, request, *args, **kwargs):
-        ret = super(WorkflowJobTemplateList, self).post(request, *args, **kwargs)
-        if ret.status_code == 201:
-            workflow_job_template = WorkflowJobTemplate.objects.get(id=ret.data['id'])
-            workflow_job_template.admin_role.members.add(request.user)
-        return ret
-    '''
 
-
-# TODO:
 class WorkflowJobTemplateDetail(WorkflowsEnforcementMixin, RetrieveUpdateDestroyAPIView):
 
     model = WorkflowJobTemplate
@@ -3006,7 +2994,6 @@ class WorkflowJobRelaunch(WorkflowsEnforcementMixin, GenericAPIView):
         return Response(data, status=status.HTTP_201_CREATED, headers=headers)
 
 
-# TODO:
 class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCreateAPIView):
 
     model = WorkflowJobTemplateNode
@@ -3022,7 +3009,6 @@ class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCre
         return super(WorkflowJobTemplateWorkflowNodesList, self).update_raw_data(data)
 
 
-# TODO:
 class WorkflowJobTemplateJobsList(WorkflowsEnforcementMixin, SubListAPIView):
 
     model = WorkflowJob
@@ -3101,7 +3087,6 @@ class WorkflowJobTemplateActivityStreamList(WorkflowsEnforcementMixin, ActivityS
     new_in_310 = True
 
 
-# TODO:
 class WorkflowJobList(WorkflowsEnforcementMixin, ListCreateAPIView):
 
     model = WorkflowJob
@@ -3109,7 +3094,6 @@ class WorkflowJobList(WorkflowsEnforcementMixin, ListCreateAPIView):
     new_in_310 = True
 
 
-# TODO:
 class WorkflowJobDetail(WorkflowsEnforcementMixin, RetrieveDestroyAPIView):
 
     model = WorkflowJob
@@ -3121,7 +3105,7 @@ class WorkflowJobWorkflowNodesList(WorkflowsEnforcementMixin, SubListAPIView):
 
     model = WorkflowJobNode
     serializer_class = WorkflowJobNodeListSerializer
-    always_allow_superuser = True # TODO: RBAC
+    always_allow_superuser = True
     parent_model = WorkflowJob
     relationship = 'workflow_job_nodes'
     parent_key = 'workflow_job'
diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py
index a864e57390..1369e4dc52 100644
--- a/awx/main/models/workflow.py
+++ b/awx/main/models/workflow.py
@@ -245,8 +245,7 @@ class WorkflowJobNode(WorkflowNodeBase):
             accepted_fields, ignored_fields = ujt_obj._accept_or_ignore_job_kwargs(**self.prompts_dict())
             for fd in ujt_obj._extra_job_type_errors(accepted_fields):
                 accepted_fields.pop(fd)
-            data.update(accepted_fields)
-            # TODO: decide what to do in the event of missing fields
+            data.update(accepted_fields)  # missing fields are handled in the scheduler
         # build ancestor artifacts, save them to node model for later
         aa_dict = {}
         for parent_node in self.get_parent_nodes():
@@ -489,10 +488,6 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
         result['body'] = '\n'.join(str_arr)
         return result
 
-    # TODO: Ask UI if this is needed ?
-    #def get_ui_url(self):
-    #    return urlparse.urljoin(tower_settings.TOWER_URL_BASE, "/#/workflow_jobs/{}".format(self.pk))
-
     @property
     def task_impact(self):
         return 0