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

Merge pull request #4631 from wenottingham/stop-me-before-i-touch-javascript-again

Browse Source 
Fix fetching of result traceback in job details.

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
             https://github.com/jakemcdermott
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-08-30 22:01:38 +00:00
committed by GitHub
parent fd32eff281 a7db4cf367
commit 09c105e125
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/features/output/details.component.js
View File

@@ -442,8 +442,8 @@ function getJobExplanationDetails () {
return { label, less, more, showMore, hasMoreToShow }; return { label, less, more, showMore, hasMoreToShow };
} }
function getResultTracebackDetails () { function getResultTracebackDetails (resultTraceback) {
const traceback = resource.model.get('result_traceback'); const traceback = resultTraceback || resource.model.get('result_traceback');
if (!traceback) { if (!traceback) {
return null; return null;
@@ -871,7 +871,8 @@ function JobDetailsController (
instanceGroup, instanceGroup,
environment, environment,
artifacts, artifacts,
executionNode executionNode,
resultTraceback
}) => { }) => {
vm.started = getStartDetails(started); vm.started = getStartDetails(started);
vm.finished = getFinishDetails(finished); vm.finished = getFinishDetails(finished);
@@ -883,6 +884,7 @@ function JobDetailsController (
vm.artifacts = getArtifactsDetails(artifacts); vm.artifacts = getArtifactsDetails(artifacts);
vm.executionNode = getExecutionNodeDetails(executionNode); vm.executionNode = getExecutionNodeDetails(executionNode);
vm.inventoryScm = getInventoryScmDetails(inventoryScm.id, inventoryScm.status); vm.inventoryScm = getInventoryScmDetails(inventoryScm.id, inventoryScm.status);
vm.resultTraceback = getResultTracebackDetails(resultTraceback);
vm.scmRevision = getSCMRevisionDetails(scmRevision); vm.scmRevision = getSCMRevisionDetails(scmRevision);
vm.instanceGroup = getInstanceGroupDetails(instanceGroup); vm.instanceGroup = getInstanceGroupDetails(instanceGroup);
vm.status = getStatusDetails(status); vm.status = getStatusDetails(status);

7
awx/ui/client/features/output/status.service.js
View File

@@ -303,6 +303,12 @@ function JobStatusService (moment, message) {
this.statsEvent = data; this.statsEvent = data;
}; };
this.setResultTraceback = traceback => {
if (!traceback) return;
this.state.resultTraceback = traceback;
};
this.setHostStatusCounts = counts => { this.setHostStatusCounts = counts => {
counts = counts || {}; counts = counts || {};
@@ -341,6 +347,7 @@ function JobStatusService (moment, message) {
this.setEnvironment(model.get('custom_virtualenv')); this.setEnvironment(model.get('custom_virtualenv'));
this.setArtifacts(model.get('artifacts')); this.setArtifacts(model.get('artifacts'));
this.setExecutionNode(model.get('execution_node')); this.setExecutionNode(model.get('execution_node'));
this.setResultTraceback(model.get('result_traceback'));
this.initHostStatusCounts({ model }); this.initHostStatusCounts({ model });
this.initPlaybookCounts({ model }); this.initPlaybookCounts({ model });