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

resolves kickback on #2862

Browse Source
This commit is contained in:
Leigh Johnson
2016-07-11 12:23:30 -04:00
parent 34523d59a2
commit c721e234e2
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/src/lists/ScheduledJobs.js
View File

@@ -45,14 +45,17 @@ export default
sourceModel: 'unified_job_template', sourceModel: 'unified_job_template',
sourceField: 'unified_job_type', sourceField: 'unified_job_type',
ngBind: 'schedule.type_label', ngBind: 'schedule.type_label',
searchField: 'unified_job_template__name', searchField: 'unified_job_template__polymorphic_ctype__model',
searchLable: 'Type', filterBySearchField: true,
searchLabel: 'Type',
searchable: true, searchable: true,
searchType: 'select', searchType: 'select',
searchOptions: [ searchOptions: [
{ value: 'inventory source', label: 'Inventory Sync' }, { value: 'inventorysource', label: 'Inventory Sync' },
{ value: 'job template', label: 'Playbook Run' }, { value: 'jobtemplate', label: 'Playbook Run' },
{ value: 'project', label: 'SCM Update' } { value: 'project', label: 'SCM Update' },
{ value: 'systemjobtemplate', label: 'Management Job'}
] ]
}, },
next_run: { next_run: {

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

@@ -6,7 +6,12 @@ export default ['Rest', '$q', 'GetBasePath', 'Wait', 'ProcessErrors', '$log', fu
var obj = {}; var obj = {};
// build the value (key) // build the value (key)
var value; var value;
if (field.sourceModel && field.sourceField) { console.log(field)
if (field.searchField && field.filterBySearchField === true){
value = field.searchField;
}
else if (field.sourceModel && field.sourceField) {
console.log('condition met 2')
value = field.sourceModel + '__' + field.sourceField; value = field.sourceModel + '__' + field.sourceField;
obj.related = true; obj.related = true;
} else if (typeof(field.key) === String) { } else if (typeof(field.key) === String) {