From a94042def54db6542f783be889e1cb39f2cca0fb Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Wed, 7 Nov 2018 22:53:49 -0500 Subject: [PATCH] display inventory on workflow job details --- .../workflow-results.controller.js | 11 ++++++++++- .../workflow-results.partial.html | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/workflow-results/workflow-results.controller.js b/awx/ui/client/src/workflow-results/workflow-results.controller.js index fdb0acca79..f40e8867d1 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.controller.js +++ b/awx/ui/client/src/workflow-results/workflow-results.controller.js @@ -32,6 +32,14 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions', $scope.cloud_credential_link = getLink('cloud_credential'); $scope.network_credential_link = getLink('network_credential'); + if ($scope.workflow.summary_fields.inventory) { + if ($scope.workflow.summary_fields.inventory.kind === 'smart') { + $scope.inventory_link = '/#/inventories/smart/' + $scope.workflow.inventory; + } else { + $scope.inventory_link = '/#/inventories/inventory/' + $scope.workflow.inventory; + } + } + $scope.strings = { tooltips: { RELAUNCH: i18n._('Relaunch using the same parameters'), @@ -54,7 +62,8 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions', STATUS: i18n._('Status'), SLICE_TEMPLATE: i18n._('Slice Job Template'), JOB_EXPLANATION: i18n._('Explanation'), - SOURCE_WORKFLOW_JOB: i18n._('Source Workflow') + SOURCE_WORKFLOW_JOB: i18n._('Source Workflow'), + INVENTORY: i18n._('Inventory') }, details: { HEADER: i18n._('DETAILS'), diff --git a/awx/ui/client/src/workflow-results/workflow-results.partial.html b/awx/ui/client/src/workflow-results/workflow-results.partial.html index 7fbc1ae332..48dacb6e3f 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.partial.html +++ b/awx/ui/client/src/workflow-results/workflow-results.partial.html @@ -125,6 +125,21 @@ + +
+ + +
+