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

fix jobs sort

Browse Source
This commit is contained in:
John Mitchell
2016-06-17 13:54:01 -04:00
parent 462d43060e
commit b447544dc7
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa
scope: jobs_scope, scope: jobs_scope,
list: AllJobsList, list: AllJobsList,
id: 'active-jobs', id: 'active-jobs',
url: GetBasePath('unified_jobs') + '?status__in=pending,waiting,running,completed,failed,successful,error,canceled', url: GetBasePath('unified_jobs') + '?status__in=pending,waiting,running,completed,failed,successful,error,canceled&order_by=-finished',
searchParams: search_params, searchParams: search_params,
spinner: false spinner: false
}); });

1
awx/ui/client/src/helpers/search.js
View File

@@ -302,6 +302,7 @@ export default
url += connect + scope[iterator + 'ExtraParms']; url += connect + scope[iterator + 'ExtraParms'];
} }
url = url.replace(/\&\&/g, '&').replace(/\?\&/,'?'); url = url.replace(/\&\&/g, '&').replace(/\?\&/,'?');
if (calcOnly) { if (calcOnly) {
scope.$emit('searchParamsReady', url); scope.$emit('searchParamsReady', url);
} }

2
awx/ui/client/src/lists/AllJobs.js
View File

@@ -34,8 +34,6 @@ export default
] ]
}, },
id: { id: {
key: true,
desc: true,
label: 'ID', label: 'ID',
ngClick:"viewJobDetails(all_job)", ngClick:"viewJobDetails(all_job)",
searchType: 'int', searchType: 'int',