From be3ec6d8d8106ae458e860673d294cde7bd92124 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Wed, 30 Nov 2016 12:34:28 -0800
Subject: [PATCH] making jerkins happy

---
 .../src/job-results/job-results.controller.js | 21 +++++++++++--------
 .../job-results.controller-test.js            |  2 --
 2 files changed, 12 insertions(+), 11 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 be4cc4bd41..dfef8fca10 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -9,21 +9,12 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
             }
         };
 
-        $scope.job_template_link = `/#/templates/job_template/${$scope.job.summary_fields.job_template.id}`;
         $scope.created_by_link = getTowerLink('created_by');
         $scope.inventory_link = getTowerLink('inventory');
         $scope.project_link = getTowerLink('project');
         $scope.machine_credential_link = getTowerLink('credential');
         $scope.cloud_credential_link = getTowerLink('cloud_credential');
         $scope.network_credential_link = getTowerLink('network_credential');
-        if(jobData.summary_fields && jobData.summary_fields.project_update &&
-            jobData.summary_fields.project_update.status){
-             $scope.project_status = jobData.summary_fields.project_update.status;
-        }
-        if(jobData.summary_fields && jobData.summary_fields.project_update &&
-            jobData.summary_fields.project_update.id){
-            $scope.project_update_link = `/#/scm_update/${jobData.summary_fields.project_update.id}`;
-        }
     };
 
     // uses options to set scope variables to their readable string
@@ -57,6 +48,18 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
 
     // turn related api browser routes into tower routes
     getTowerLinks();
+    if(jobData.summary_fields && jobData.summary_fields.job_template &&
+        jobData.summary_fields.job_template.id){
+            $scope.job_template_link = `/#/templates/job_template/${$scope.job.summary_fields.job_template.id}`;
+    }
+    if(jobData.summary_fields && jobData.summary_fields.project_update &&
+        jobData.summary_fields.project_update.status){
+         $scope.project_status = jobData.summary_fields.project_update.status;
+    }
+    if(jobData.summary_fields && jobData.summary_fields.project_update &&
+        jobData.summary_fields.project_update.id){
+        $scope.project_update_link = `/#/scm_update/${jobData.summary_fields.project_update.id}`;
+    }
 
     // use options labels to manipulate display of details
     getTowerLabels();
diff --git a/awx/ui/tests/spec/job-results/job-results.controller-test.js b/awx/ui/tests/spec/job-results/job-results.controller-test.js
index d3b4405adf..5114bf64c8 100644
--- a/awx/ui/tests/spec/job-results/job-results.controller-test.js
+++ b/awx/ui/tests/spec/job-results/job-results.controller-test.js
@@ -130,7 +130,6 @@ describe('Controller: jobResultsController', () => {
     describe('getTowerLinks()', () => {
         beforeEach(() => {
             jobData.related = {
-                "job_template": "api/v1/job_templates/12",
                 "created_by": "api/v1/users/12",
                 "inventory": "api/v1/inventories/12",
                 "project": "api/v1/projects/12",
@@ -143,7 +142,6 @@ describe('Controller: jobResultsController', () => {
         });
 
         it('should transform related links and set to scope var', () => {
-            expect($scope.job_template_link).toBe('/#/job_templates/12');
             expect($scope.created_by_link).toBe('/#/users/12');
             expect($scope.inventory_link).toBe('/#/inventories/12');
             expect($scope.project_link).toBe('/#/projects/12');