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

Merge pull request #6856 from mabashian/4987-relaunch-redirect

Browse Source 
Remain on jobs list when relaunching jobs
This commit is contained in:
Michael Abashian
2017-07-06 10:04:20 -04:00
committed by GitHub
parent 5df0ba5a06 5421cd0f0d
commit 48c2fb51e0
1 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
View File

@@ -146,42 +146,40 @@ export default
$state.go(state, {id: job}, {reload:true}); $state.go(state, {id: job}, {reload:true});
}; };
if(_.has(data, 'job')) { if($state.includes('jobs')) {
goTojobResults('jobResult');
} else if(base === 'jobs'){
if(scope.clearDialog) {
scope.clearDialog();
}
return; return;
} else if(data.type && data.type === 'workflow_job') {
job = data.id;
goTojobResults('workflowResults');
} }
else if(_.has(data, 'ad_hoc_command')) {
goTojobResults('adHocJobStdout'); else {
} if(_.has(data, 'job')) {
else if(_.has(data, 'system_job')) { goTojobResults('jobResult');
goTojobResults('managementJobStdout'); } else if(data.type && data.type === 'workflow_job') {
} job = data.id;
else if(_.has(data, 'project_update')) { goTojobResults('workflowResults');
// If we are on the projects list or any child state of that list }
// then we want to stay on that page. Otherwise go to the stdout else if(_.has(data, 'ad_hoc_command')) {
// view. goTojobResults('adHocJobStdout');
if(!$state.includes('projects')) { }
goTojobResults('scmUpdateStdout'); else if(_.has(data, 'system_job')) {
goTojobResults('managementJobStdout');
}
else if(_.has(data, 'project_update')) {
// If we are on the projects list or any child state of that list
// then we want to stay on that page. Otherwise go to the stdout
// view.
if(!$state.includes('projects')) {
goTojobResults('scmUpdateStdout');
}
}
else if(_.has(data, 'inventory_update')) {
// If we are on the inventory manage page or any child state of that
// page then we want to stay on that page. Otherwise go to the stdout
// view.
if(!$state.includes('inventories.edit')) {
goTojobResults('inventorySyncStdout');
}
} }
} }
else if(_.has(data, 'inventory_update')) {
// If we are on the inventory manage page or any child state of that
// page then we want to stay on that page. Otherwise go to the stdout
// view.
if(!$state.includes('inventories.edit')) {
goTojobResults('inventorySyncStdout');
}
}
}
if(scope.clearDialog) {
scope.clearDialog();
} }
}) })
.error(function(data, status) { .error(function(data, status) {