Queued Jobs

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.

awx/ui/static/js/helpers/Jobs.js

@@ -511,7 +511,7 @@ function(Find, GetBasePath, Rest, Wait, ProcessErrors, Prompt, Alert){
         }
         scope.removeCancelJob = scope.$on('CancelJob', function() {
             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({
                 hdr: hdr,
                 body: "<div class=\"alert alert-info\">" + body + " job #" + id + " " + job.name  + "?</div>",

awx/ui/static/js/lists/QueuedJobs.js

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