From fc304899bd5d260f06a1447e4dfcadaec87207b3 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 14 Jul 2016 20:09:46 -0700 Subject: [PATCH] Jobs list page size (#3019) * changing jobs list page size to 20 by default it was previously set to 10 * adjustment to tag search check for null id --- awx/ui/client/src/controllers/Jobs.js | 2 ++ awx/ui/client/src/search/tagSearch.service.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/controllers/Jobs.js b/awx/ui/client/src/controllers/Jobs.js index 27cbd6f8f5..1e5d4067a7 100644 --- a/awx/ui/client/src/controllers/Jobs.js +++ b/awx/ui/client/src/controllers/Jobs.js @@ -66,6 +66,7 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa scope: jobs_scope, list: AllJobsList, id: 'active-jobs', + pageSize: 20, url: GetBasePath('unified_jobs') + '?status__in=pending,waiting,running,completed,failed,successful,error,canceled&order_by=-finished', searchParams: search_params, spinner: false @@ -77,6 +78,7 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa parent_scope: $scope, scope: scheduled_scope, list: ScheduledJobsList, + pageSize: 20, id: 'scheduled-jobs-tab', searchSize: 'col-lg-4 col-md-4 col-sm-4 col-xs-12', url: GetBasePath('schedules') + '?next_run__isnull=false' diff --git a/awx/ui/client/src/search/tagSearch.service.js b/awx/ui/client/src/search/tagSearch.service.js index fdd808d3ad..4e5e6ae3ec 100644 --- a/awx/ui/client/src/search/tagSearch.service.js +++ b/awx/ui/client/src/search/tagSearch.service.js @@ -85,7 +85,7 @@ export default ['Rest', '$q', 'GetBasePath', 'Wait', 'ProcessErrors', '$log', fu if (needsRequest.length) { // make the options request to reutrn the typeOptions var url = needsRequest[0].basePath ? GetBasePath(needsRequest[0].basePath) : basePath; - if(url.indexOf('null') === 0 ){ + if(url.indexOf('null') === -1 ){ Rest.setUrl(url); Rest.options() .success(function (data) {