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

Fixes basic host filter searches

Browse Source
This commit is contained in:
mabashian
2019-05-07 14:43:53 -04:00
parent b85cc716a4
commit f524c94bad
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/shared/smart-search/queryset.service.js
View File

@@ -1,7 +1,5 @@
function searchWithoutKey (term, singleSearchParam = null) { function searchWithoutKey (term, singleSearchParam = null) {
if (singleSearchParam === 'host_filter') { if (singleSearchParam) {
return { [singleSearchParam]: `${encodeURIComponent(term)}` };
} else if (singleSearchParam) {
return { [singleSearchParam]: `search=${encodeURIComponent(term)}` }; return { [singleSearchParam]: `search=${encodeURIComponent(term)}` };
} }
return { search: encodeURIComponent(term) }; return { search: encodeURIComponent(term) };
@@ -418,7 +416,11 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
let termParams; let termParams;
if (termParts.length === 1) { 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))) { } else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) {
termParams = this.encodeParam({ term, singleSearchParam, searchTerm: true }); termParams = this.encodeParam({ term, singleSearchParam, searchTerm: true });
} else if (isRelatedField && isRelatedField(termParts)) { } else if (isRelatedField && isRelatedField(termParts)) {