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

Queued Jobs

Browse Source 
Changed sort order to asc ID rather than desc ID. Changed delete/cancel icon to always be cancel. The prompt dialog now always shows 'Submit request to cancel' rather than 'Delete...' for jobs with a status == 'new' even though the API request is DELETE.
This commit is contained in:
Chris Houseknecht
2014-09-04 11:04:37 -04:00
parent 45ae4dd672
commit e48309b6aa
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/helpers/Jobs.js
View File

@@ -511,7 +511,7 @@ function(Find, GetBasePath, Rest, Wait, ProcessErrors, Prompt, Alert){
} }
scope.removeCancelJob = scope.$on('CancelJob', function() { scope.removeCancelJob = scope.$on('CancelJob', function() {
var body; var body;
body = (action_label === 'cancel') ? "Submit the request to cancel" : "Delete"; body = (action_label === 'cancel' || job.status === 'new') ? "Submit the request to cancel" : "Delete";
Prompt({ Prompt({
hdr: hdr, hdr: hdr,
body: "<div class=\"alert alert-info\">" + body + " job #" + id + " " + job.name + "?</div>", body: "<div class=\"alert alert-info\">" + body + " job #" + id + " " + job.name + "?</div>",

5
awx/ui/static/js/lists/QueuedJobs.js
View File

@@ -24,7 +24,6 @@ angular.module('QueuedJobsDefinition', [])
label: 'ID', label: 'ID',
ngClick:"viewJobLog(queued_job.id)", ngClick:"viewJobLog(queued_job.id)",
key: true, key: true,
desc: true,
searchType: 'int', searchType: 'int',
columnClass: 'col-lg-1 col-md-1 col-sm-2 col-xs-2', columnClass: 'col-lg-1 col-md-1 col-sm-2 col-xs-2',
awToolTip: "{{ queued_job.status_tip }}", awToolTip: "{{ queued_job.status_tip }}",
@@ -76,10 +75,10 @@ angular.module('QueuedJobsDefinition', [])
awToolTip: 'Relaunch using the same parameters', awToolTip: 'Relaunch using the same parameters',
dataPlacement: 'top' dataPlacement: 'top'
}, },
"delete": { 'cancel': {
mode: 'all', mode: 'all',
ngClick: 'deleteJob(queued_job.id)', ngClick: 'deleteJob(queued_job.id)',
awToolTip: 'Delete the job', awToolTip: 'Cancel the job',
dataPlacement: 'top' dataPlacement: 'top'
}, },
job_details: { job_details: {