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

Merge pull request #3978 from mabashian/3528-workflow-launch-transition

Browse Source 
Transition the user to the workflow details view after launch
This commit is contained in:
Michael Abashian
2016-11-11 16:16:39 -05:00
committed by GitHub
parent 649dbef47d 392ee19290
commit 887afb79f8
2 changed files with 17 additions and 4 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

@@ -112,7 +112,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 || data.workflow_job;
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
@@ -123,6 +123,9 @@ export default
if(_.has(data, 'job')) { if(_.has(data, 'job')) {
goToJobDetails('jobDetail'); goToJobDetails('jobDetail');
} }
else if(_.has(data, 'workflow_job')) {
goToJobDetails('workflowResults');
}
else if(_.has(data, 'ad_hoc_command')) { else if(_.has(data, 'ad_hoc_command')) {
goToJobDetails('adHocJobStdout'); goToJobDetails('adHocJobStdout');
} }

16
awx/ui/client/src/job-templates/list/job-templates-list.controller.js
View File

@@ -7,10 +7,12 @@
export default ['$scope', '$rootScope', '$location', '$stateParams', 'Rest', 'Alert', export default ['$scope', '$rootScope', '$location', '$stateParams', 'Rest', 'Alert',
'JobTemplateList', 'Prompt', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'JobTemplateList', 'Prompt', 'ClearScope', 'ProcessErrors', 'GetBasePath',
'InitiatePlaybookRun', 'Wait', '$state', '$filter', 'Dataset', 'rbacUiControlService', 'JobTemplateService', 'InitiatePlaybookRun', 'Wait', '$state', '$filter', 'Dataset', 'rbacUiControlService', 'JobTemplateService',
'QuerySet',
function( function(
$scope, $rootScope, $location, $stateParams, Rest, Alert, $scope, $rootScope, $location, $stateParams, Rest, Alert,
JobTemplateList, Prompt, ClearScope, ProcessErrors, GetBasePath, JobTemplateList, Prompt, ClearScope, ProcessErrors, GetBasePath,
InitiatePlaybookRun, Wait, $state, $filter, Dataset, rbacUiControlService, JobTemplateService InitiatePlaybookRun, Wait, $state, $filter, Dataset, rbacUiControlService, JobTemplateService,
qs
) { ) {
ClearScope(); ClearScope();
@@ -39,8 +41,16 @@ export default ['$scope', '$rootScope', '$location', '$stateParams', 'Rest', 'Al
} }
$scope.$on(`ws-jobs`, function () { $scope.$on(`ws-jobs`, function () {
// @issue - this is ham-fisted, expose a simple QuerySet.reload() fn that'll re-fetch dataset // @issue - this is no longer quite as ham-fisted but I'd like for someone else to take a peek
$state.reload(); // calling $state.reload(); here was problematic when launching a job because job launch also
// attempts to transition the state and they were squashing each other.
let path = GetBasePath(list.basePath) || GetBasePath(list.name);
qs.search(path, $stateParams[`${list.iterator}_search`])
.then(function(searchResponse) {
$scope[`${list.iterator}_dataset`] = searchResponse.data;
$scope[list.name] = $scope[`${list.iterator}_dataset`].results;
});
}); });
$scope.addJobTemplate = function() { $scope.addJobTemplate = function() {
$state.go('jobTemplates.add'); $state.go('jobTemplates.add');