From 4bea2aa627fcf4e23b82e14b21d9cedb35744119 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 21 Jul 2016 11:03:50 -0400 Subject: [PATCH 1/2] Show new jobs in UI Jobs tab --- awx/ui/client/src/controllers/Jobs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/controllers/Jobs.js b/awx/ui/client/src/controllers/Jobs.js index a7408259a2..eafbfbb981 100644 --- a/awx/ui/client/src/controllers/Jobs.js +++ b/awx/ui/client/src/controllers/Jobs.js @@ -67,7 +67,7 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa list: AllJobsList, id: 'active-jobs', pageSize: 20, - url: GetBasePath('unified_jobs') + '?status__in=pending,waiting,running,completed,failed,successful,error,canceled&order_by=-finished', + url: GetBasePath('unified_jobs') + '?status__in=pending,waiting,running,completed,failed,successful,error,canceled,new&order_by=-finished', searchParams: search_params, spinner: false }); From 94c8dfd506a5f27e8267320d08d59152c667eb4d Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 21 Jul 2016 09:05:32 -0400 Subject: [PATCH 2/2] Allow instant cancel for new jobs --- awx/main/models/unified_jobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 36b2dfe75e..f7106eb7ab 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -873,7 +873,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique if not self.cancel_flag: self.cancel_flag = True cancel_fields = ['cancel_flag'] - if self.status in ('pending', 'waiting'): + if self.status in ('pending', 'waiting', 'new'): self.status = 'canceled' cancel_fields.append('status') self.save(update_fields=cancel_fields)