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

On lists searchField now has precedence over sourceModel/sourceField when generating search query string.

Browse Source
This commit is contained in:
chouseknecht
2013-06-17 11:40:51 -04:00
parent f9b385bed2
commit c979817593
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ansibleworks/ui/static/js/helpers/search.js
View File

@@ -100,14 +100,15 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
if ( (scope[iterator + 'SelectShow'] == false && scope[iterator + 'SearchValue'] != '' && scope[iterator + 'SearchValue'] != undefined) || if ( (scope[iterator + 'SelectShow'] == false && scope[iterator + 'SearchValue'] != '' && scope[iterator + 'SearchValue'] != undefined) ||
(scope[iterator + 'SelectShow'] && scope[iterator + 'SearchSelectValue']) || (scope[iterator + 'SelectShow'] && scope[iterator + 'SearchSelectValue']) ||
(list.fields[scope[iterator + 'SearchField']].searchType && list.fields[scope[iterator + 'SearchField']].searchType == 'gtzero') ) { (list.fields[scope[iterator + 'SearchField']].searchType && list.fields[scope[iterator + 'SearchField']].searchType == 'gtzero') ) {
if (list.fields[scope[iterator + 'SearchField']].sourceModel) {
if (list.fields[scope[iterator + 'SearchField']].searchField) {
scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].searchField + '__';
}
else if (list.fields[scope[iterator + 'SearchField']].sourceModel) {
// handle fields whose source is a related model e.g. inventories.organization // handle fields whose source is a related model e.g. inventories.organization
scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].sourceModel + '__' + scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].sourceModel + '__' +
list.fields[scope[iterator + 'SearchField']].sourceField + '__'; list.fields[scope[iterator + 'SearchField']].sourceField + '__';
} }
else if (list.fields[scope[iterator + 'SearchField']].searchField) {
scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].searchField + '__';
}
else { else {
scope[iterator + 'SearchParams'] = '?' + scope[iterator + 'SearchField'] + '__'; scope[iterator + 'SearchParams'] = '?' + scope[iterator + 'SearchField'] + '__';
} }

3
ansibleworks/ui/static/js/lists/JobEvents.js
View File

@@ -35,7 +35,8 @@ angular.module('JobEventsListDefinition', [])
ngClick: "viewHost(\{\{ jobevent.host \}\})", ngClick: "viewHost(\{\{ jobevent.host \}\})",
ngBind: 'jobevent.host_name', ngBind: 'jobevent.host_name',
sourceModel: 'host', sourceModel: 'host',
sourceField: 'name' sourceField: 'name',
searchField: 'hosts__name'
}, },
status: { status: {
label: 'Status', label: 'Status',