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

Leave user on jobs list when relaunching adhoc command

Browse Source
This commit is contained in:
Michael Abashian
2017-02-20 14:45:12 -05:00
parent ce0096f308
commit 66f37533ec
2 changed files with 4 additions and 1 deletions
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) Rest.post(postData)
.success(function (data) { .success(function (data) {
Wait('stop'); 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) { .error(function (data, status) {
ProcessErrors(scope, 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", label: "Launch",
onClick: function() { onClick: function() {
scope.$emit(callback); scope.$emit(callback);
$('#password-modal').dialog('close');
}, },
icon: "fa-check", icon: "fa-check",
"class": "btn btn-primary", "class": "btn btn-primary",