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

Merge pull request #4709 from AlanCoding/workflow_code_tweaks

Browse Source 
Minor workflow code cleanup & performance
This commit is contained in:
Alan Rominger
2017-01-13 14:55:58 -05:00
committed by GitHub
parent 8b7435ccd3 a93ad270f2
commit 481514dea4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -2370,7 +2370,7 @@ class WorkflowJobTemplateNodeSerializer(WorkflowNodeBaseSerializer):
if view and view.request: if view and view.request:
request_method = view.request.method request_method = view.request.method
if request_method in ['PATCH']: if request_method in ['PATCH']:
obj = view.get_object() obj = self.instance
char_prompts = copy.copy(obj.char_prompts) char_prompts = copy.copy(obj.char_prompts)
char_prompts.update(self.extract_char_prompts(data)) char_prompts.update(self.extract_char_prompts(data))
else: else:

3
awx/main/access.py
View File

@@ -1395,7 +1395,8 @@ class WorkflowJobTemplateNodeAccess(BaseAccess):
qs = self.model.objects.filter( qs = self.model.objects.filter(
workflow_job_template__in=WorkflowJobTemplate.accessible_objects( workflow_job_template__in=WorkflowJobTemplate.accessible_objects(
self.user, 'read_role')) self.user, 'read_role'))
qs = qs.prefetch_related('success_nodes', 'failure_nodes', 'always_nodes') qs = qs.prefetch_related('success_nodes', 'failure_nodes', 'always_nodes',
'unified_job_template')
return qs return qs
def can_use_prompted_resources(self, data): def can_use_prompted_resources(self, data):

1
awx/main/tests/unit/api/serializers/test_workflow_serializers.py
View File

@@ -125,6 +125,7 @@ class TestWorkflowJobTemplateNodeSerializerCharPrompts():
serializer = WorkflowJobTemplateNodeSerializer() serializer = WorkflowJobTemplateNodeSerializer()
node = WorkflowJobTemplateNode(pk=1) node = WorkflowJobTemplateNode(pk=1)
node.char_prompts = {'limit': 'webservers'} node.char_prompts = {'limit': 'webservers'}
serializer.instance = node
view = FakeView(node) view = FakeView(node)
view.request = FakeRequest() view.request = FakeRequest()
view.request.method = "PATCH" view.request.method = "PATCH"