External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 19:30:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5471 from mabashian/4987-adhoc

Browse Source 
Leave user on jobs list when relaunching adhoc command
This commit is contained in:
Michael Abashian 2017-02-21 10:06:08 -05:00 committed by GitHub
commit f377136095
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/helpers/Adhoc.js
View File

@ -104,7 +104,9 @@ export default
Rest.post(postData)
.success(function (data) {
Wait('stop');
$state.go('adHocJobStdout', {id: data.id});
if($location.path().replace(/^\//, '').split('/')[0] !== 'jobs') {
$state.go('adHocJobStdout', {id: data.id});
}
})
.error(function (data, status) {
ProcessErrors(scope, data, status, {

1
awx/ui/client/src/helpers/JobSubmission.js
View File

@ -46,6 +46,7 @@ function($compile, CreateDialog, Wait, ParseTypeChange) {
label: "Launch",
onClick: function() {
scope.$emit(callback);
$('#password-modal').dialog('close');
},
icon: "fa-check",
"class": "btn btn-primary",