External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 12:57:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4684 from mabashian/4577-relaunch-workflow-job

Browse Source 
Relaunch workflow bug fixes
This commit is contained in:
Michael Abashian
2017-01-12 09:54:36 -05:00
committed by GitHub
parent 258405aefe 83a6b8ba53
commit 265a829203
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ export default
Rest.post(job_launch_data) Rest.post(job_launch_data)
.success(function(data) { .success(function(data) {
Wait('stop'); Wait('stop');
var job = data.job || data.system_job || data.project_update || data.inventory_update || data.ad_hoc_command || data.workflow_job; var job = data.job || data.system_job || data.project_update || data.inventory_update || data.ad_hoc_command;
if($rootScope.portalMode===false && Empty(data.system_job) || (base === 'home')){ if($rootScope.portalMode===false && Empty(data.system_job) || (base === 'home')){
// use $state.go with reload: true option to re-instantiate sockets in // use $state.go with reload: true option to re-instantiate sockets in
@@ -131,7 +131,8 @@ export default
if(_.has(data, 'job')) { if(_.has(data, 'job')) {
goToJobDetails('jobDetail'); goToJobDetails('jobDetail');
} }
else if(_.has(data, 'workflow_job')) { else if(data.type && data.type === 'workflow_job') {
job = data.id;
goToJobDetails('workflowResults'); goToJobDetails('workflowResults');
} }
else if(_.has(data, 'ad_hoc_command')) { else if(_.has(data, 'ad_hoc_command')) {

2
awx/ui/client/src/workflow-results/workflow-results.service.js
View File

@@ -126,7 +126,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr
}, },
relaunchJob: function(scope) { relaunchJob: function(scope) {
InitiatePlaybookRun({ scope: scope, id: scope.workflow.id, InitiatePlaybookRun({ scope: scope, id: scope.workflow.id,
relaunch: true, job_type: 'workflow_job_template' }); relaunch: true, job_type: 'workflow_job' });
} }
}; };
return val; return val;