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

use correct param names when calling encodeParams

Browse Source
This commit is contained in:
Jake McDermott
2018-05-03 00:42:36 -04:00
parent 2b1bef54ce
commit 1ed9f609fc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,7 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
} }
let paramString = exclude ? "not__" : ""; let paramString = exclude ? "not__" : "";
let valueString = paramParts[1]; let valueString = paramParts[1];
if(keySplit.length === 1) { if(keySplit.length === 1) {
if(searchTerm && !lessThanGreaterThan) { if(searchTerm && !lessThanGreaterThan) {
if(singleSearchParam) { if(singleSearchParam) {
@@ -407,9 +408,9 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
if (termParts.length === 1) { if (termParts.length === 1) {
termParams = searchWithoutKey(term, singleSearchParam); 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 }); termParams = this.encodeParam({ term, singleSearchParam, searchTerm: true });
} else if (isRelatedField && isRelatedField(termParts)) { } else if (isRelatedField && isRelatedField(termParts)) {
termParams = this.encodeParam({ term, singleSearchParam, related: true }); termParams = this.encodeParam({ term, singleSearchParam, relatedSearchTerm: true });
} else { } else {
termParams = searchWithoutKey(term, singleSearchParam); termParams = searchWithoutKey(term, singleSearchParam);
} }
@@ -458,9 +459,9 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
if (termParts.length === 1) { if (termParts.length === 1) {
removed = searchWithoutKey(term, singleSearchParam); removed = searchWithoutKey(term, singleSearchParam);
} else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) { } else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) {
removed = this.encodeParam({ term, singleSearchParam }); removed = this.encodeParam({ term, singleSearchParam, searchTerm: true });
} else if (isRelatedField && isRelatedField(termParts)) { } else if (isRelatedField && isRelatedField(termParts)) {
removed = this.encodeParam({ term, singleSearchParam, related: true }); removed = this.encodeParam({ term, singleSearchParam, relatedSearchTerm: true });
} else { } else {
removed = searchWithoutKey(term, singleSearchParam); removed = searchWithoutKey(term, singleSearchParam);
} }