From 973695e6d81006ae3bd63ab7de1ada3cfc9388d5 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 26 Aug 2014 12:14:40 -0400 Subject: [PATCH] Jobs page Filter schedules by job type. https://trello.com/c/cw57g3Vw/45-jobs-tab-scheduled-jobs-do-not-allow-filtering-by-type --- awx/ui/static/js/helpers/search.js | 1 - awx/ui/static/js/lists/ScheduledJobs.js | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/awx/ui/static/js/helpers/search.js b/awx/ui/static/js/helpers/search.js index bd5bc6e168..b8bdb75359 100644 --- a/awx/ui/static/js/helpers/search.js +++ b/awx/ui/static/js/helpers/search.js @@ -374,7 +374,6 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper']) } else { scope[iterator + 'ShowStartBtn' + modifier] = true; } - if ((!scope[iterator + 'SelectShow' + modifier] && !Empty(scope[iterator + 'SearchValue' + modifier])) || (scope[iterator + 'SelectShow' + modifier] && scope[iterator + 'SearchSelectValue' + modifier]) || (list.fields[scope[iterator + 'SearchField' + modifier]] && diff --git a/awx/ui/static/js/lists/ScheduledJobs.js b/awx/ui/static/js/lists/ScheduledJobs.js index 830f508efa..10ee4a16b2 100644 --- a/awx/ui/static/js/lists/ScheduledJobs.js +++ b/awx/ui/static/js/lists/ScheduledJobs.js @@ -45,8 +45,15 @@ angular.module('ScheduledJobsDefinition', []) sourceModel: 'unified_job_template', sourceField: 'unified_job_type', ngBind: 'schedule.type_label', - searchable: false, - nosort: true + searchField: 'unified_job_template__polymorphic_ctype__name', + searchLable: 'Type', + searchable: true, + searchType: 'select', + searchOptions: [ + { value: 'inventory source', name: 'Inventory Sync' }, + { value: 'job template', name: 'Playbook Run' }, + { value: 'project', name: 'SCM Update' } + ] }, name: { label: 'Name',