zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-05 16:01:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tower/release_3.2.2' into devel

Browse Source
This commit is contained in:
Matthew Jones
2017-12-13 12:25:47 -05:00
parent 05bec924e4 fac7fd45f8
commit 9dbcc5934e
144 changed files with 9292 additions and 9012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) {
if($scope.singleSearchParam) {
return {
[$scope.singleSearchParam]: encodeURIComponent("search=" + term)
[$scope.singleSearchParam]: "search=" + encodeURIComponent(term)
};
}
return {
@@ -328,6 +328,10 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
else {
if($scope.singleSearchParam && set[$scope.singleSearchParam] && set[$scope.singleSearchParam].includes("%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);
if (index !== -1) {
searchParamParts.splice(index, 1);