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

Merge branch '1312' into release_3.0.0

Browse Source
This commit is contained in:
Leigh Johnson 2016-06-17 20:44:20 -04:00
commit de9b44e041
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/helpers/related-search.js
View File

@ -237,6 +237,9 @@ export default
url += (url.match(/\/$/)) ? '?' : '&';
url += scope[iterator + 'SearchParams'];
url += (scope[iterator + '_page_size']) ? '&page_size=' + scope[iterator + '_page_size'] : "";
if (scope[iterator + 'SearchFilters']){
url += _.reduce(scope[iterator+'SearchFilters'], (result, filter) => result + '&' + filter.url, '');
}
RefreshRelated({ scope: scope, set: set, iterator: iterator, url: url });
};

4
awx/ui/client/src/helpers/search.js
View File

@ -302,7 +302,9 @@ export default
url += connect + scope[iterator + 'ExtraParms'];
}
url = url.replace(/\&\&/g, '&').replace(/\?\&/,'?');
if (scope[iterator + 'SearchFilters']){
url += _.reduce(scope[iterator+'SearchFilters'], (result, filter) => result + '&' + filter.url, '');
}
if (calcOnly) {
scope.$emit('searchParamsReady', url);
}

3
awx/ui/client/src/search/getSearchHtml.service.js
View File

@ -43,7 +43,8 @@ export default ['GetBasePath', function(GetBasePath) {
return "<tag-search list='" + list +
"' endpoint='" + endpoint +
"' set='" + set +
"' iterator='" + iterator + "'></tag-search>";
"' iterator='" + iterator +
"' current-search-filters='" + iterator + "SearchFilters' ></tag-search>";
};
return this;

3
awx/ui/client/src/search/tagSearch.directive.js
View File

@ -10,7 +10,8 @@ export default
list: '@',
endpoint: '@',
set: '@',
iterator: '@'
iterator: '@',
currentSearchFilters: '='
},
controller: tagSearchController,
templateUrl: templateUrl('search/tagSearch'),