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

Search

Browse Source 
Fixed ?& and mishandling of 'in' search type. Trello: https://trello.com/c/qrkTCicN/316-update-inventory-source-types-in-home-groups
This commit is contained in:
Chris Houseknecht
2014-08-18 11:26:03 -04:00
parent f4cce01af0
commit caff0572a5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/static/js/helpers/search.js
View File

@@ -278,7 +278,7 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
connect = (/\/$/.test(url)) ? '?' : '&'; connect = (/\/$/.test(url)) ? '?' : '&';
url += connect + scope[iterator + 'ExtraParms']; url += connect + scope[iterator + 'ExtraParms'];
} }
url = url.replace(/\&\&/g, '&'); url = url.replace(/\&\&/g, '&').replace(/\?\&/,'?');
if (calcOnly) { if (calcOnly) {
scope.$emit('searchParamsReady', url); scope.$emit('searchParamsReady', url);
} }
@@ -405,6 +405,11 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
} else if ( (list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'select') && } else if ( (list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'select') &&
Empty(scope[iterator + 'SearchSelectValue' + modifier].value) && !/\_\_$/.test(scope[iterator + 'SearchParams']) ) { Empty(scope[iterator + 'SearchSelectValue' + modifier].value) && !/\_\_$/.test(scope[iterator + 'SearchParams']) ) {
scope[iterator + 'SearchParams'] += '=iexact='; scope[iterator + 'SearchParams'] += '=iexact=';
} else if (list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'in') {
if (!/\_\_$/.test(scope[iterator + 'SearchParams'])) {
scope[iterator + 'SearchParams'] += '__';
}
scope[iterator + 'SearchParams'] += 'in=';
} else if (/\_\_$/.test(scope[iterator + 'SearchParams'])) { } else if (/\_\_$/.test(scope[iterator + 'SearchParams'])) {
scope[iterator + 'SearchParams'] += 'icontains='; scope[iterator + 'SearchParams'] += 'icontains=';
} else { } else {