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

Redirecting non-playbook-jobs to correct stdout pages

Browse Source
This commit is contained in:
Jared Tabor
2016-06-08 14:37:16 -07:00
parent c5aee042ce
commit 945380c07a
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,10 +107,32 @@ 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; 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
$state.go('jobDetail', {id: job}, {reload: true});
var goToJobDetails = function(state) {
$state.go(state, {id: job}, {reload:true});
};
switch(key[0]) {
case 'job':
goToJobDetails('jobDetail');
break;
case 'ad_hoc_command':
goToJobDetails('adHocJobStdout');
break;
case 'system_job':
goToJobDetails('managementJobStdout');
break;
case 'project_update':
goToJobDetails('scmUpdateStdout');
break;
case 'inventory_update':
goToJobDetails('inventorySyncStdout');
break;
}
} }
if(scope.clearDialog) { if(scope.clearDialog) {
scope.clearDialog(); scope.clearDialog();

12
awx/ui/client/src/management-jobs/card/card.controller.js
View File

@@ -7,11 +7,11 @@
// import listGenerator from 'tower/shared/list-generator/main'; // import listGenerator from 'tower/shared/list-generator/main';
export default export default
[ 'Wait', '$location' , '$compile', 'CreateDialog', 'GetBasePath' , [ 'Wait', '$compile', 'CreateDialog', 'GetBasePath' ,
'SearchInit' , 'PaginateInit', 'SchedulesList', 'Rest' , 'SearchInit' , 'PaginateInit', 'SchedulesList', 'Rest' ,
'ProcessErrors', 'managementJobsListObject', '$rootScope', '$state', 'ProcessErrors', 'managementJobsListObject', '$rootScope', '$state',
'$scope', 'CreateSelect2', '$scope', 'CreateSelect2',
function( Wait, $location, $compile, CreateDialog, GetBasePath, function( Wait, $compile, CreateDialog, GetBasePath,
SearchInit, PaginateInit, SchedulesList, Rest, ProcessErrors, SearchInit, PaginateInit, SchedulesList, Rest, ProcessErrors,
managementJobsListObject, $rootScope, $state, $scope, managementJobsListObject, $rootScope, $state, $scope,
CreateSelect2) { CreateSelect2) {
@@ -129,11 +129,11 @@ export default
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.post(data) Rest.post(data)
.success(function() { .success(function(data) {
Wait('stop'); Wait('stop');
$("#prompt-for-days-facts").dialog("close"); $("#prompt-for-days-facts").dialog("close");
$("#configure-tower-dialog").dialog('close'); $("#configure-tower-dialog").dialog('close');
$location.path('/jobs/'); $state.go('managementJobStdout', {id: data.system_job}, {reload:true});
}) })
.error(function(data, status) { .error(function(data, status) {
ProcessErrors(scope, data, status, null, { hdr: 'Error!', ProcessErrors(scope, data, status, null, { hdr: 'Error!',
@@ -217,11 +217,11 @@ export default
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.post(data) Rest.post(data)
.success(function() { .success(function(data) {
Wait('stop'); Wait('stop');
$("#prompt-for-days").dialog("close"); $("#prompt-for-days").dialog("close");
// $("#configure-tower-dialog").dialog('close'); // $("#configure-tower-dialog").dialog('close');
$location.path('/jobs/'); $state.go('managementJobStdout', {id: data.system_job}, {reload:true});
}) })
.error(function(data, status) { .error(function(data, status) {
ProcessErrors(scope, data, status, null, { hdr: 'Error!', ProcessErrors(scope, data, status, null, { hdr: 'Error!',