diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 2af29d5b05..9b60a7fbd7 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -50,15 +50,26 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy var getTowerLinks = function() { var getTowerLink = function(key) { - if ($scope.job.related[key]) { - return '/#/' + $scope.job.related[key] - .split('api/v1/')[1]; - } else { - return null; + if(key === 'schedule') { + if($scope.job.related.schedule) { + return '/#/templates/job_template/' + $scope.job.job_template + '/schedules' + $scope.job.related.schedule.split('api/v1/schedules')[1]; + } + else { + return null; + } + } + else { + if ($scope.job.related[key]) { + return '/#/' + $scope.job.related[key] + .split('api/v1/')[1]; + } else { + return null; + } } }; $scope.created_by_link = getTowerLink('created_by'); + $scope.scheduled_by_link = getTowerLink('schedule'); $scope.inventory_link = getTowerLink('inventory'); $scope.project_link = getTowerLink('project'); $scope.machine_credential_link = getTowerLink('credential'); @@ -316,7 +327,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy .stdout)($scope.events[mungedEvent .counter])); }; - + if (!$scope.events[mungedEvent.counter]) { // line hasn't been put in the pane yet 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 43d4423a9f..5151690f74 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.controller.js +++ b/awx/ui/client/src/workflow-results/workflow-results.controller.js @@ -26,17 +26,27 @@ export default ['workflowData', var getTowerLinks = function() { var getTowerLink = function(key) { - if ($scope.workflow.related[key]) { - return '/#/' + $scope.workflow.related[key] - .split('api/v1/')[1]; + if(key === 'schedule') { + if($scope.workflow.related.schedule) { + return '/#/templates/workflow_job_template/' + $scope.workflow.workflow_job_template + '/schedules' + $scope.workflow.related.schedule.split('api/v1/schedules')[1]; + } + else { + return null; + } } else { - return null; + if ($scope.workflow.related[key]) { + return '/#/' + $scope.workflow.related[key] + .split('api/v1/')[1]; + } else { + return null; + } } }; $scope.workflow_template_link = '/#/templates/workflow_job_template/'+$scope.workflow.workflow_job_template; $scope.created_by_link = getTowerLink('created_by'); + $scope.scheduled_by_link = getTowerLink('schedule');console.log($scope.scheduled_by_link); $scope.cloud_credential_link = getTowerLink('cloud_credential'); $scope.network_credential_link = getTowerLink('network_credential'); }; 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 a1b6c40db1..8c0bd7aae9 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.partial.html +++ b/awx/ui/client/src/workflow-results/workflow-results.partial.html @@ -113,6 +113,21 @@ + +