From c979817593021c3ab149613db9f7bcf6de747956 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Mon, 17 Jun 2013 11:40:51 -0400 Subject: [PATCH] On lists searchField now has precedence over sourceModel/sourceField when generating search query string. --- ansibleworks/ui/static/js/helpers/search.js | 9 +++++---- ansibleworks/ui/static/js/lists/JobEvents.js | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ansibleworks/ui/static/js/helpers/search.js b/ansibleworks/ui/static/js/helpers/search.js index d701592253..4b2842627f 100644 --- a/ansibleworks/ui/static/js/helpers/search.js +++ b/ansibleworks/ui/static/js/helpers/search.js @@ -100,14 +100,15 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper']) if ( (scope[iterator + 'SelectShow'] == false && scope[iterator + 'SearchValue'] != '' && scope[iterator + 'SearchValue'] != undefined) || (scope[iterator + 'SelectShow'] && scope[iterator + 'SearchSelectValue']) || (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 scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].sourceModel + '__' + list.fields[scope[iterator + 'SearchField']].sourceField + '__'; } - else if (list.fields[scope[iterator + 'SearchField']].searchField) { - scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].searchField + '__'; - } else { scope[iterator + 'SearchParams'] = '?' + scope[iterator + 'SearchField'] + '__'; } diff --git a/ansibleworks/ui/static/js/lists/JobEvents.js b/ansibleworks/ui/static/js/lists/JobEvents.js index 5f19a21c1c..490bd1a137 100644 --- a/ansibleworks/ui/static/js/lists/JobEvents.js +++ b/ansibleworks/ui/static/js/lists/JobEvents.js @@ -35,7 +35,8 @@ angular.module('JobEventsListDefinition', []) ngClick: "viewHost(\{\{ jobevent.host \}\})", ngBind: 'jobevent.host_name', sourceModel: 'host', - sourceField: 'name' + sourceField: 'name', + searchField: 'hosts__name' }, status: { label: 'Status',