From f524c94bad1a710d152c8539dc1471aa767017bd Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 7 May 2019 14:43:53 -0400 Subject: [PATCH] Fixes basic host filter searches --- .../client/src/shared/smart-search/queryset.service.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js index 2db940b94c..df143f0580 100644 --- a/awx/ui/client/src/shared/smart-search/queryset.service.js +++ b/awx/ui/client/src/shared/smart-search/queryset.service.js @@ -1,7 +1,5 @@ function searchWithoutKey (term, singleSearchParam = null) { - if (singleSearchParam === 'host_filter') { - return { [singleSearchParam]: `${encodeURIComponent(term)}` }; - } else if (singleSearchParam) { + if (singleSearchParam) { return { [singleSearchParam]: `search=${encodeURIComponent(term)}` }; } return { search: encodeURIComponent(term) }; @@ -418,7 +416,11 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc let termParams; if (termParts.length === 1) { - termParams = searchWithoutKey(term, singleSearchParam); + if (singleSearchParam && termParts[0].toLowerCase() === "or") { + termParams = { [singleSearchParam]: "or" } + } else { + termParams = searchWithoutKey(term, singleSearchParam); + } } else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) { termParams = this.encodeParam({ term, singleSearchParam, searchTerm: true }); } else if (isRelatedField && isRelatedField(termParts)) {