External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5292 from jaredevantabor/smart-search

Browse Source 
Related searches
This commit is contained in:
Jared Tabor
2017-02-10 10:50:50 -08:00
committed by GitHub
parent fe29446298 ae69ca8919
commit 43665373e5
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/shared/smart-search/smart-search.controller.js
View File

@@ -249,6 +249,13 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', '
params = _.merge(params, qs.encodeParam({term: term, searchTerm: true}), combineSameSearches); params = _.merge(params, qs.encodeParam({term: term, searchTerm: true}), combineSameSearches);
} }
} }
// The related fields need to also be checked for related searches.
// The related fields for the search are retrieved from the API
// options endpoint, and are stored in the $scope.model. FYI, the
// Django search model is what sets the related fields on the model.
else if(_.contains($scope.models[$scope.list.name].related, root)) {
params = _.merge(params, qs.encodeParam({term: term, relatedSearchTerm: true}), combineSameSearches);
}
// Its not a search term or a related search term - treat it as a string // Its not a search term or a related search term - treat it as a string
else { else {
params = _.merge(params, setDefaults(term), combineSameSearches); params = _.merge(params, setDefaults(term), combineSameSearches);