External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-09 15:28:05 -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

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

@@ -146,13 +146,13 @@ export default
$state.go(state, {id: job}, {reload:true}); $state.go(state, {id: job}, {reload:true});
}; };
if($state.includes('jobs')) {
return;
}
else {
if(_.has(data, 'job')) { if(_.has(data, 'job')) {
goTojobResults('jobResult'); goTojobResults('jobResult');
} else if(base === 'jobs'){
if(scope.clearDialog) {
scope.clearDialog();
}
return;
} else if(data.type && data.type === 'workflow_job') { } else if(data.type && data.type === 'workflow_job') {
job = data.id; job = data.id;
goTojobResults('workflowResults'); goTojobResults('workflowResults');
@@ -180,8 +180,6 @@ export default
} }
} }
} }
if(scope.clearDialog) {
scope.clearDialog();
} }
}) })
.error(function(data, status) { .error(function(data, status) {