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

WIP WFJT Node Activity Stream Bug Fix

Browse Source
This commit is contained in:
beeankha
2019-03-19 11:29:19 -04:00
parent 3d9a47f0d9
commit a1dd5a4e19
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/api/serializers.py
View File

@@ -4021,7 +4021,7 @@ class WorkflowJobTemplateNodeDetailSerializer(WorkflowJobTemplateNodeSerializer)
Influence the api browser sample data to not include workflow_job_template Influence the api browser sample data to not include workflow_job_template
when editing a WorkflowNode. when editing a WorkflowNode.
Note: I was not able to accomplish this trough the use of extra_kwargs. Note: I was not able to accomplish this through the use of extra_kwargs.
Maybe something to do with workflow_job_template being a relational field? Maybe something to do with workflow_job_template being a relational field?
''' '''
def build_relational_field(self, field_name, relation_info): def build_relational_field(self, field_name, relation_info):
@@ -5070,6 +5070,18 @@ class ActivityStreamSerializer(BaseSerializer):
if fval is not None: if fval is not None:
job_template_item[field] = fval job_template_item[field] = fval
summary_fields['job_template'].append(job_template_item) summary_fields['job_template'].append(job_template_item)
if fk == 'workflow_job_template_node':
summary_fields['workflow_job_template'] = []
workflow_job_template_item = {}
workflow_job_template_fields = SUMMARIZABLE_FK_FIELDS['workflow_job_template']
workflow_job_template = getattr(thisItem, 'workflow_job_template', None)
if workflow_job_template is not None:
for field in workflow_job_template_fields:
fval = getattr(workflow_job_template, field, None)
if fval is not None:
workflow_job_template_item[field] = fval
summary_fields['workflow_job_template'].append(workflow_job_template_item)
# to adhere to DRY principles, the above can eventually be combined into a helper method
if fk == 'schedule': if fk == 'schedule':
unified_job_template = getattr(thisItem, 'unified_job_template', None) unified_job_template = getattr(thisItem, 'unified_job_template', None)
if unified_job_template is not None: if unified_job_template is not None:

3
awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
View File

@@ -75,6 +75,9 @@ export default function BuildAnchor($log, $filter) {
case 'workflow_job_template': case 'workflow_job_template':
url += `templates/workflow_job_template/${obj.id}`; url += `templates/workflow_job_template/${obj.id}`;
break; break;
case 'workflow_job_template_node':
url += `templates/workflow_job_template/${obj.summary_fields.workflow_job_template.id}`;
break;
case 'workflow_job': case 'workflow_job':
url += `workflows/${obj.id}`; url += `workflows/${obj.id}`;
break; break;