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

Merge pull request #3105 from AlanCoding/new_job_cancel

Browse Source 
Fixes for "new" job things in 3.0.1
This commit is contained in:
Alan Rominger
2016-07-22 16:13:39 -04:00
committed by GitHub
parent a1b29d8f4b 94c8dfd506
commit 4b3f1d44de
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/unified_jobs.py
View File

@@ -873,7 +873,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
if not self.cancel_flag: if not self.cancel_flag:
self.cancel_flag = True self.cancel_flag = True
cancel_fields = ['cancel_flag'] cancel_fields = ['cancel_flag']
if self.status in ('pending', 'waiting'): if self.status in ('pending', 'waiting', 'new'):
self.status = 'canceled' self.status = 'canceled'
cancel_fields.append('status') cancel_fields.append('status')
self.save(update_fields=cancel_fields) self.save(update_fields=cancel_fields)

2
awx/ui/client/src/controllers/Jobs.js
View File

@@ -67,7 +67,7 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa
list: AllJobsList, list: AllJobsList,
id: 'active-jobs', id: 'active-jobs',
pageSize: 20, 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, searchParams: search_params,
spinner: false spinner: false
}); });