diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js index 32b55de80c..06e9cd7b64 100644 --- a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js +++ b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js @@ -94,7 +94,18 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce } }); + // stdoutText optionall gets passed through in the directive declaration. + $scope.$watch('stdoutText', function(newVal, oldVal) { + if(newVal && newVal !== oldVal) { + $('#pre-container-content').html(newVal); + } + }); + function loadStdout() { + if (!$scope.stdoutEndpoint) { + return; + } + Rest.setUrl($scope.stdoutEndpoint + '?format=json&start_line=0&end_line=' + page_size); Rest.get() .success(function(data) { @@ -123,6 +134,10 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce } function getNextSection() { + if (!$scope.stdoutEndpoint) { + return; + } + // get the next range of data from the API var start = loaded_sections[loaded_sections.length - 1].end, url; url = $scope.stdoutEndpoint + '?format=json&start_line=' + start + '&end_line=' + (start + page_size); diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.directive.js b/awx/ui/client/src/standard-out/log/standard-out-log.directive.js index a780a1f4d3..d7d0656441 100644 --- a/awx/ui/client/src/standard-out/log/standard-out-log.directive.js +++ b/awx/ui/client/src/standard-out/log/standard-out-log.directive.js @@ -10,6 +10,7 @@ export default [ 'templateUrl', return { scope: { stdoutEndpoint: '=', + stdoutText: '=', jobId: '=' }, templateUrl: templateUrl('standard-out/log/standard-out-log'), diff --git a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html index 2f0baa6e0e..6b4afaa4e9 100644 --- a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html +++ b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html @@ -70,7 +70,7 @@ - +