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

Handle the injected __search and __icontains so that they don't show up in the search tags.

Browse Source
This commit is contained in:
Michael Abashian
2017-01-11 10:47:06 -05:00
parent a36981dcb9
commit 644e464798
1 changed files with 7 additions and 3 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

@@ -68,6 +68,9 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
function encodeTerm(value, key){ function encodeTerm(value, key){
key = key.replace(/__icontains_DEFAULT/g, "__icontains");
key = key.replace(/__search_DEFAULT/g, "__search");
if (Array.isArray(value)){ if (Array.isArray(value)){
let concated = ''; let concated = '';
angular.forEach(value, function(item){ angular.forEach(value, function(item){
@@ -99,10 +102,10 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
let valueString = paramParts[1]; let valueString = paramParts[1];
if(keySplit.length === 1) { if(keySplit.length === 1) {
if(params.searchTerm && !lessThanGreaterThan) { if(params.searchTerm && !lessThanGreaterThan) {
paramString += keySplit[0] + '__icontains'; paramString += keySplit[0] + '__icontains_DEFAULT';
} }
else if(params.relatedSearchTerm) { else if(params.relatedSearchTerm) {
paramString += keySplit[0] + '__search'; paramString += keySplit[0] + '__search_DEFAULT';
} }
else { else {
paramString += keySplit[0]; paramString += keySplit[0];
@@ -142,7 +145,8 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
return decodeURIComponent(`${searchString}`); return decodeURIComponent(`${searchString}`);
} }
else { else {
key = key.replace(/__icontains/g, ""); key = key.replace(/__icontains_DEFAULT/g, "");
key = key.replace(/__search_DEFAULT/g, "");
let split = key.split('__'); let split = key.split('__');
let decodedParam = searchString; let decodedParam = searchString;
let exclude = false; let exclude = false;