zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-14 07:48:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix host filter parsing

Browse Source
This commit is contained in:
gconsidine
2017-09-14 15:31:29 -04:00
parent 28a26e6e81
commit 57c9224b5c
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/client/src/shared/smart-search/smart-search.controller.js
+1 -1
View File
@@ -164,7 +164,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
let splitTerms;
if ($scope.singleSearchParam === 'host_filter') {
splitTerms = SmartSearchService.splitHostIntoTerms(terms);
splitTerms = SmartSearchService.splitFilterIntoTerms(terms);
} else {
splitTerms = SmartSearchService.splitSearchIntoTerms(terms);
}
awx/ui/client/src/shared/smart-search/smart-search.service.js
+11 -4
View File
@@ -6,10 +6,14 @@ export default [function() {
* work is done to encode quotes in quoted values and the spaces within those quoted
* values before calling to `splitSearchIntoTerms`.
*/
splitHostIntoTerms (searchString) {
splitFilterIntoTerms (searchString) {
let groups = [];
let quoted;
if (!searchString.includes(' ')) {
return this.splitSearchIntoTerms(this.encode(searchString));
}
searchString.split(' ').forEach(substring => {
if (substring.includes(':"')) {
quoted = substring;
@@ -17,9 +21,7 @@ export default [function() {
quoted += ` ${substring}`;
if (substring.includes('"')) {
quoted = quoted.replace(/"/g, encodeURIComponent('"'));
quoted = quoted.replace(/ /g, encodeURIComponent(' '));
groups.push(quoted);
groups.push(this.encode(quoted));
quoted = undefined;
}
} else {
@@ -29,6 +31,11 @@ export default [function() {
return this.splitSearchIntoTerms(groups.join(' '));
},
encode (string) {
string = string.replace(/'/g, '%27');
return string.replace(/("| )/g, match => encodeURIComponent(match));
},
splitSearchIntoTerms(searchString) {
return searchString.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g);
},