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

making jerkins happy

Browse Source
This commit is contained in:
jaredevantabor
2016-11-30 12:34:28 -08:00
committed by Michael Abashian
parent 50691b77db
commit be3ec6d8d8
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.created_by_link = getTowerLink('created_by');
$scope.inventory_link = getTowerLink('inventory'); $scope.inventory_link = getTowerLink('inventory');
$scope.project_link = getTowerLink('project'); $scope.project_link = getTowerLink('project');
$scope.machine_credential_link = getTowerLink('credential'); $scope.machine_credential_link = getTowerLink('credential');
$scope.cloud_credential_link = getTowerLink('cloud_credential'); $scope.cloud_credential_link = getTowerLink('cloud_credential');
$scope.network_credential_link = getTowerLink('network_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 // 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 // turn related api browser routes into tower routes
getTowerLinks(); 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 // use options labels to manipulate display of details
getTowerLabels(); getTowerLabels();

2
awx/ui/tests/spec/job-results/job-results.controller-test.js
View File

@@ -130,7 +130,6 @@ describe('Controller: jobResultsController', () => {
describe('getTowerLinks()', () => { describe('getTowerLinks()', () => {
beforeEach(() => { beforeEach(() => {
jobData.related = { jobData.related = {
"job_template": "api/v1/job_templates/12",
"created_by": "api/v1/users/12", "created_by": "api/v1/users/12",
"inventory": "api/v1/inventories/12", "inventory": "api/v1/inventories/12",
"project": "api/v1/projects/12", "project": "api/v1/projects/12",
@@ -143,7 +142,6 @@ describe('Controller: jobResultsController', () => {
}); });
it('should transform related links and set to scope var', () => { 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.created_by_link).toBe('/#/users/12');
expect($scope.inventory_link).toBe('/#/inventories/12'); expect($scope.inventory_link).toBe('/#/inventories/12');
expect($scope.project_link).toBe('/#/projects/12'); expect($scope.project_link).toBe('/#/projects/12');