External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 06:29:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix for traceback

Browse Source
This commit is contained in:
jaredevantabor
2017-01-26 12:11:31 -08:00
parent bad9e9fcf0
commit 484eda4aa1
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/job-results/job-results.controller.js
View File

@@ -107,11 +107,11 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
})); }));
$scope.previousTaskFailed = false; $scope.previousTaskFailed = false;
$scope.hideTraceback = false;
toDestroy.push($scope.$watch('job.job_explanation', function(explanation) { toDestroy.push($scope.$watch('job.job_explanation', function(explanation) {
if (explanation && explanation.split(":")[0] === "Previous Task Failed") { if (explanation && explanation.split(":")[0] === "Previous Task Failed") {
$scope.previousTaskFailed = true; $scope.previousTaskFailed = true;
var taskObj = JSON.parse(explanation.substring(explanation.split(":")[0].length + 1)); var taskObj = JSON.parse(explanation.substring(explanation.split(":")[0].length + 1));
// return a promise from the options request with the permission type choices (including adhoc) as a param // return a promise from the options request with the permission type choices (including adhoc) as a param
var fieldChoice = fieldChoices({ var fieldChoice = fieldChoices({
@@ -132,10 +132,6 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
$scope.explanation_fail_id = taskObj.job_id; $scope.explanation_fail_id = taskObj.job_id;
$scope.task_detail = $scope.explanation_fail_type + " failed for " + $scope.explanation_fail_name + " with ID " + $scope.explanation_fail_id + "."; $scope.task_detail = $scope.explanation_fail_type + " failed for " + $scope.explanation_fail_name + " with ID " + $scope.explanation_fail_id + ".";
}); });
if(taskObj.job_type === "project_update"){
$scope.hideTraceback = true;
}
} else { } else {
$scope.previousTaskFailed = false; $scope.previousTaskFailed = false;
} }

2
awx/ui/client/src/job-results/job-results.partial.html
View File

@@ -127,7 +127,7 @@
<!-- RESULTS TRACEBACK DETAIL --> <!-- RESULTS TRACEBACK DETAIL -->
<div class="JobResults-resultRow" <div class="JobResults-resultRow"
ng-show="job.result_traceback && !hideTraceback"> ng-show="job.result_traceback && !previousTaskFailed">
<label class="JobResults-resultRowLabel"> <label class="JobResults-resultRowLabel">
Results Traceback Results Traceback
</label> </label>