Merge pull request #2283 from mabashian/job-launch-redirect

Redirect after job launch
This commit is contained in:
Michael Abashian
2016-06-09 17:57:24 -04:00
committed by GitHub

View File

@@ -107,8 +107,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, var job = data.job || data.system_job || data.project_update || data.inventory_update || data.ad_hoc_command;
key = Object.keys(data);
if((scope.portalMode===false || scope.$parent.portalMode===false ) && Empty(data.system_job) || (base === 'home')){ if((scope.portalMode===false || scope.$parent.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
@@ -116,22 +115,20 @@ export default
$state.go(state, {id: job}, {reload:true}); $state.go(state, {id: job}, {reload:true});
}; };
switch(key[0]) { if(_.has(data, 'job')) {
case 'job': goToJobDetails('jobDetail');
goToJobDetails('jobDetail'); }
break; else if(_.has(data, 'ad_hoc_command')) {
case 'ad_hoc_command': goToJobDetails('adHocJobStdout');
goToJobDetails('adHocJobStdout'); }
break; else if(_.has(data, 'system_job')) {
case 'system_job': goToJobDetails('managementJobStdout');
goToJobDetails('managementJobStdout'); }
break; else if(_.has(data, 'project_update')) {
case 'project_update': goToJobDetails('scmUpdateStdout');
goToJobDetails('scmUpdateStdout'); }
break; else if(_.has(data, 'inventory_update')) {
case 'inventory_update': goToJobDetails('inventorySyncStdout');
goToJobDetails('inventorySyncStdout');
break;
} }
} }
if(scope.clearDialog) { if(scope.clearDialog) {