From c52796da61dd9fd25c913b000cc4de274de83cc7 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 17 Feb 2017 15:55:21 -0500
Subject: [PATCH 1/2] show error message for <= 3.0.x jobs

---
 .../job-results-stdout.partial.html               |  4 +++-
 .../src/job-results/job-results.controller.js     | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html
index c283d578f7..88ee156a4e 100644
--- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html
+++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html
@@ -35,7 +35,7 @@
         <div class="JobResultsStdOut-numberColumnPreload"></div>
         <div id='lineAnchor' class="JobResultsStdOut-lineAnchor"></div>
         <div class="JobResultsStdOut-aLineOfStdOut"
-            ng-show="tooManyEvents || tooManyPastEvents">
+            ng-show="tooManyEvents || tooManyPastEvents || showLegacyJobErrorMessage">
             <div class="JobResultsStdOut-lineNumberColumn">
                 <span class="JobResultsStdOut-lineExpander">  </span>
             </div>
@@ -43,6 +43,8 @@
                 ng-show="tooManyEvents">The standard output is too large to display.  Please specify additional filters to narrow the standard out.</div>
             <div class="JobResultsStdOut-stdoutColumn JobResultsStdOut-stdoutColumn--tooMany"
                 ng-show="tooManyPastEvents">Too much previous output to display.  Showing running standard output.</div>
+            <div class="JobResultsStdOut-stdoutColumn JobResultsStdOut-stdoutColumn--tooMany"
+                ng-show="showLegacyJobErrorMessage">Job details are not available for this job.  Please download to view standard out.</div>
         </div>
         <!-- next is 1 is a hack to get the first line to be put in the pane in the
         right place -->
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 7cef7c342f..f68fbe1275 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -437,6 +437,18 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
     $scope.playCount = 0;
     $scope.taskCount = 0;
 
+
+    // used to show a message to just download for old jobs
+    // remove in 3.2.0
+    $scope.isOld = 0;
+    $scope.showLegacyJobErrorMessage = false;
+
+    $scope.$watch('isOld', function (val) {
+        if (val >= 2) {
+            $scope.showLegacyJobErrorMessage = true;
+        }
+    });
+
     // get header and recap lines
     var skeletonPlayCount = 0;
     var skeletonTaskCount = 0;
@@ -444,6 +456,9 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
         jobResultsService.getEvents(url)
             .then(events => {
                 events.results.forEach(event => {
+                    if (event.start_line === 0 && event.end_line === 0) {
+                        $scope.isOld++;
+                    }
                     // get the name in the same format as the data
                     // coming over the websocket
                     event.event_name = event.event;

From 329156a9eba4b0317daaf2444f8c57a0e53a5986 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 17 Feb 2017 16:48:44 -0500
Subject: [PATCH 2/2] add toDestroy to watch statement

---
 awx/ui/client/src/job-results/job-results.controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 f68fbe1275..582c4f3988 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -443,11 +443,11 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
     $scope.isOld = 0;
     $scope.showLegacyJobErrorMessage = false;
 
-    $scope.$watch('isOld', function (val) {
+    toDestroy.push($scope.$watch('isOld', function (val) {
         if (val >= 2) {
             $scope.showLegacyJobErrorMessage = true;
         }
-    });
+    }));
 
     // get header and recap lines
     var skeletonPlayCount = 0;