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

Merge pull request #5309 from mabashian/5042-schedule-type-sort

Browse Source 
Restore the ability to specify a search field for column sorting
This commit is contained in:
Michael Abashian
2017-02-10 20:25:20 -05:00
committed by GitHub
parent b2fa3d80ae 84b426079e
commit 392242b1a5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,8 @@ export default
columnClass: "col-lg-2 col-md-2 hidden-sm hidden-xs", columnClass: "col-lg-2 col-md-2 hidden-sm hidden-xs",
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__polymorphic_ctype__model'
}, },
next_run: { next_run: {
label: i18n._('Next Run'), label: i18n._('Next Run'),

2
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@@ -494,7 +494,7 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
collection="${list.name}" collection="${list.name}"
dataset="${list.iterator}_dataset" dataset="${list.iterator}_dataset"
column-sort column-sort
column-field="${fld}" column-field="${list.fields[fld].searchField || fld}"
column-iterator="${list.iterator}" column-iterator="${list.iterator}"
column-no-sort="${list.fields[fld].nosort}" column-no-sort="${list.fields[fld].nosort}"
column-label="${list.fields[fld].label}" column-label="${list.fields[fld].label}"