External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-21 10:57:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

removal of workflow TODOs that are resolved

Browse Source
This commit is contained in:
AlanCoding
2017-01-25 09:26:05 -05:00
parent 8650b69c9e
commit bae3fdb635
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/api/views.py
View File

@@ -2771,7 +2771,7 @@ class WorkflowJobTemplateNodeChildrenBaseList(WorkflowsEnforcementMixin, Enforce
model = WorkflowJobTemplateNode model = WorkflowJobTemplateNode
serializer_class = WorkflowJobTemplateNodeListSerializer serializer_class = WorkflowJobTemplateNodeListSerializer
always_allow_superuser = True # TODO: RBAC always_allow_superuser = True
parent_model = WorkflowJobTemplateNode parent_model = WorkflowJobTemplateNode
relationship = '' relationship = ''
enforce_parent_relationship = 'workflow_job_template' enforce_parent_relationship = 'workflow_job_template'
@@ -2869,7 +2869,6 @@ class WorkflowJobNodeAlwaysNodesList(WorkflowJobNodeChildrenBaseList):
relationship = 'always_nodes' relationship = 'always_nodes'
# TODO:
class WorkflowJobTemplateList(WorkflowsEnforcementMixin, ListCreateAPIView): class WorkflowJobTemplateList(WorkflowsEnforcementMixin, ListCreateAPIView):
model = WorkflowJobTemplate model = WorkflowJobTemplate
@@ -2877,18 +2876,7 @@ class WorkflowJobTemplateList(WorkflowsEnforcementMixin, ListCreateAPIView):
always_allow_superuser = False always_allow_superuser = False
new_in_310 = True 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): class WorkflowJobTemplateDetail(WorkflowsEnforcementMixin, RetrieveUpdateDestroyAPIView):
model = WorkflowJobTemplate model = WorkflowJobTemplate
@@ -3006,7 +2994,6 @@ class WorkflowJobRelaunch(WorkflowsEnforcementMixin, GenericAPIView):
return Response(data, status=status.HTTP_201_CREATED, headers=headers) return Response(data, status=status.HTTP_201_CREATED, headers=headers)
# TODO:
class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCreateAPIView): class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCreateAPIView):
model = WorkflowJobTemplateNode model = WorkflowJobTemplateNode
@@ -3022,7 +3009,6 @@ class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCre
return super(WorkflowJobTemplateWorkflowNodesList, self).update_raw_data(data) return super(WorkflowJobTemplateWorkflowNodesList, self).update_raw_data(data)
# TODO:
class WorkflowJobTemplateJobsList(WorkflowsEnforcementMixin, SubListAPIView): class WorkflowJobTemplateJobsList(WorkflowsEnforcementMixin, SubListAPIView):
model = WorkflowJob model = WorkflowJob
@@ -3101,7 +3087,6 @@ class WorkflowJobTemplateActivityStreamList(WorkflowsEnforcementMixin, ActivityS
new_in_310 = True new_in_310 = True
# TODO:
class WorkflowJobList(WorkflowsEnforcementMixin, ListCreateAPIView): class WorkflowJobList(WorkflowsEnforcementMixin, ListCreateAPIView):
model = WorkflowJob model = WorkflowJob
@@ -3109,7 +3094,6 @@ class WorkflowJobList(WorkflowsEnforcementMixin, ListCreateAPIView):
new_in_310 = True new_in_310 = True
# TODO:
class WorkflowJobDetail(WorkflowsEnforcementMixin, RetrieveDestroyAPIView): class WorkflowJobDetail(WorkflowsEnforcementMixin, RetrieveDestroyAPIView):
model = WorkflowJob model = WorkflowJob
@@ -3121,7 +3105,7 @@ class WorkflowJobWorkflowNodesList(WorkflowsEnforcementMixin, SubListAPIView):
model = WorkflowJobNode model = WorkflowJobNode
serializer_class = WorkflowJobNodeListSerializer serializer_class = WorkflowJobNodeListSerializer
always_allow_superuser = True # TODO: RBAC always_allow_superuser = True
parent_model = WorkflowJob parent_model = WorkflowJob
relationship = 'workflow_job_nodes' relationship = 'workflow_job_nodes'
parent_key = 'workflow_job' parent_key = 'workflow_job'

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

@@ -245,8 +245,7 @@ class WorkflowJobNode(WorkflowNodeBase):
accepted_fields, ignored_fields = ujt_obj._accept_or_ignore_job_kwargs(**self.prompts_dict()) 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): for fd in ujt_obj._extra_job_type_errors(accepted_fields):
accepted_fields.pop(fd) accepted_fields.pop(fd)
data.update(accepted_fields) data.update(accepted_fields) # missing fields are handled in the scheduler
# TODO: decide what to do in the event of missing fields
# build ancestor artifacts, save them to node model for later # build ancestor artifacts, save them to node model for later
aa_dict = {} aa_dict = {}
for parent_node in self.get_parent_nodes(): for parent_node in self.get_parent_nodes():
@@ -489,10 +488,6 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
result['body'] = '\n'.join(str_arr) result['body'] = '\n'.join(str_arr)
return result 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 @property
def task_impact(self): def task_impact(self):
return 0 return 0