diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js index 3cece3143a..000b78c437 100644 --- a/awx/ui/client/features/output/details.component.js +++ b/awx/ui/client/features/output/details.component.js @@ -481,6 +481,19 @@ function getLimitDetails () { return { label, value }; } +function getExecutionNodeDetails (node) { + const executionNode = node || resource.model.get('execution_node'); + + if (!executionNode) { + return null; + } + + const label = strings.get('labels.EXECUTION_NODE'); + const value = $filter('sanitize')(executionNode); + + return { label, value }; +} + function getInstanceGroupDetails () { const instanceGroup = resource.model.get('summary_fields.instance_group'); @@ -761,6 +774,7 @@ function JobDetailsController ( vm.credentials = getCredentialDetails(); vm.forks = getForkDetails(); vm.limit = getLimitDetails(); + vm.executionNode = getExecutionNodeDetails(); vm.instanceGroup = getInstanceGroupDetails(); vm.jobTags = getJobTagDetails(); vm.skipTags = getSkipTagDetails(); @@ -782,12 +796,21 @@ function JobDetailsController ( vm.toggleLabels = toggleLabels; vm.showLabels = showLabels; - unsubscribe = subscribe(({ status, started, finished, scm, inventoryScm, environment }) => { + unsubscribe = subscribe(({ + status, + started, + finished, + scm, + inventoryScm, + environment, + executionNode + }) => { vm.started = getStartDetails(started); vm.finished = getFinishDetails(finished); vm.projectUpdate = getProjectUpdateDetails(scm.id); vm.projectStatus = getProjectStatusDetails(scm.status); vm.environment = getEnvironmentDetails(environment); + vm.executionNode = getExecutionNodeDetails(executionNode); vm.inventoryScm = getInventoryScmDetails(inventoryScm.id, inventoryScm.status); vm.status = getStatusDetails(status); vm.job.status = status; diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html index dc979923dd..b73b0c943e 100644 --- a/awx/ui/client/features/output/details.partial.html +++ b/awx/ui/client/features/output/details.partial.html @@ -295,6 +295,12 @@
{{ vm.environment.value }}
+ +
+ +
{{ vm.executionNode.value }}
+
+
@@ -320,7 +326,6 @@
- { + if (!node) return; + + this.state.executionNode = node; + }; + this.setStatsEvent = data => { if (!data) return; @@ -321,6 +327,7 @@ function JobStatusService (moment, message) { this.setStarted(model.get('started')); this.setJobStatus(model.get('status')); this.setEnvironment(model.get('custom_virtualenv')); + this.setExecutionNode(model.get('execution_node')); this.initHostStatusCounts({ model }); this.initPlaybookCounts({ model });