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

correctly cancel/delete on job details

Browse Source 
related to #4620

* Changed cancel prompt buttons from "Cancel" "Cancel" to "Cancel"
"Proceed", talk about some confusing shit.
* Removed copy and pasted code that would call a delete upon canceling a
job
* Don't expect job_status to be an object in the view, just
`job_status`, not `job_status.status`
This commit is contained in:
Chris Meyers
2017-01-12 11:32:56 -05:00
parent 3b766cb3e3
commit c67989bc90
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/job-results/job-results.partial.html
View File

@@ -36,9 +36,9 @@
<button class="List-actionButton <button class="List-actionButton
List-actionButton--delete" List-actionButton--delete"
data-placement="top" data-placement="top"
ng-click="deleteJob()" ng-click="cancelJob()"
ng-show="job_status.status == 'running' || ng-show="job_status == 'running' ||
job_status.status=='pending' " job_status=='pending' "
aw-tool-tip="Cancel" aw-tool-tip="Cancel"
data-original-title="" title=""> data-original-title="" title="">
<i class="fa fa-minus-circle"></i> <i class="fa fa-minus-circle"></i>
@@ -49,8 +49,8 @@
List-actionButton--delete" List-actionButton--delete"
data-placement="top" data-placement="top"
ng-click="deleteJob()" ng-click="deleteJob()"
ng-hide="job_status.status == 'running' || ng-hide="job_status == 'running' ||
job_status.status == 'pending' " job_status == 'pending' "
aw-tool-tip="Delete" aw-tool-tip="Delete"
data-original-title="" data-original-title=""
title=""> title="">

16
awx/ui/client/src/job-results/job-results.service.js
View File

@@ -171,22 +171,8 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo
}); });
} }
}); });
Rest.destroy()
.success(function() {
Wait('stop');
$('#prompt-modal').modal('hide');
})
.error(function(obj, status) {
Wait('stop');
$('#prompt-modal').modal('hide');
ProcessErrors(null, obj, status, null, {
hdr: 'Error!',
msg: `Could not cancel job.
Returned status: ${status}`
});
});
}, },
actionText: 'CANCEL' actionText: 'PROCEED'
}); });
}, },
relaunchJob: function(scope) { relaunchJob: function(scope) {