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

Jobs list page size (#3019)

Browse Source 
* changing jobs list page size to 20 by default

it was previously set to 10

* adjustment to tag search check for null id
This commit is contained in:
Jared Tabor
2016-07-14 20:09:46 -07:00
committed by Leigh Johnson
parent 73722ffb77
commit fc304899bd
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +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',
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&order_by=-finished',
searchParams: search_params, searchParams: search_params,
spinner: false spinner: false
@@ -77,6 +78,7 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa
parent_scope: $scope, parent_scope: $scope,
scope: scheduled_scope, scope: scheduled_scope,
list: ScheduledJobsList, list: ScheduledJobsList,
pageSize: 20,
id: 'scheduled-jobs-tab', id: 'scheduled-jobs-tab',
searchSize: 'col-lg-4 col-md-4 col-sm-4 col-xs-12', searchSize: 'col-lg-4 col-md-4 col-sm-4 col-xs-12',
url: GetBasePath('schedules') + '?next_run__isnull=false' url: GetBasePath('schedules') + '?next_run__isnull=false'

2
awx/ui/client/src/search/tagSearch.service.js
View File

@@ -85,7 +85,7 @@ export default ['Rest', '$q', 'GetBasePath', 'Wait', 'ProcessErrors', '$log', fu
if (needsRequest.length) { if (needsRequest.length) {
// make the options request to reutrn the typeOptions // make the options request to reutrn the typeOptions
var url = needsRequest[0].basePath ? GetBasePath(needsRequest[0].basePath) : basePath; var url = needsRequest[0].basePath ? GetBasePath(needsRequest[0].basePath) : basePath;
if(url.indexOf('null') === 0 ){ if(url.indexOf('null') === -1 ){
Rest.setUrl(url); Rest.setUrl(url);
Rest.options() Rest.options()
.success(function (data) { .success(function (data) {