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

Fixed removing host filter search term with encoded character

Browse Source
This commit is contained in:
mabashian
2017-10-19 19:31:41 -04:00
parent 8d043e6f85
commit c3fbb07535
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,7 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
} }
if(params.singleSearchParam) { if(params.singleSearchParam) {
return {[params.singleSearchParam]: encodeURIComponent(paramString + "=" + valueString)}; return {[params.singleSearchParam]: paramString + "=" + valueString};
} }
else { else {
return {[paramString] : encodeURIComponent(valueString)}; return {[paramString] : encodeURIComponent(valueString)};

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

@@ -140,7 +140,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
function searchWithoutKey(term) { function searchWithoutKey(term) {
if($scope.singleSearchParam) { if($scope.singleSearchParam) {
return { return {
[$scope.singleSearchParam]: encodeURIComponent("search=" + term) [$scope.singleSearchParam]: "search=" + encodeURIComponent(term)
}; };
} }
return { return {
@@ -329,6 +329,10 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
else { else {
if($scope.singleSearchParam && set[$scope.singleSearchParam] && set[$scope.singleSearchParam].includes("%20and%20")) { if($scope.singleSearchParam && set[$scope.singleSearchParam] && set[$scope.singleSearchParam].includes("%20and%20")) {
let searchParamParts = set[$scope.singleSearchParam].split("%20and%20"); let searchParamParts = set[$scope.singleSearchParam].split("%20and%20");
// The value side of each paramPart might have been encoded in SmartSearch.splitFilterIntoTerms
_.each(searchParamParts, (paramPart, paramPartIndex) => {
searchParamParts[paramPartIndex] = decodeURIComponent(paramPart);
});
var index = searchParamParts.indexOf(value); var index = searchParamParts.indexOf(value);
if (index !== -1) { if (index !== -1) {
searchParamParts.splice(index, 1); searchParamParts.splice(index, 1);