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

fixing deletion after PR feedback from mabashian

Browse Source
This commit is contained in:
jaredevantabor
2017-02-08 11:57:01 -08:00
parent ab57396fcf
commit 2a8bff824a
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,8 +166,11 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', '
else { else {
encodeParams.searchTerm = true; encodeParams.searchTerm = true;
} }
removed = qs.encodeParam(encodeParams);
}
else {
removed = setDefaults(termParts[termParts.length-1]);
} }
removed = qs.encodeParam(encodeParams);
} }
_.each(removed, (value, key) => { _.each(removed, (value, key) => {
if (Array.isArray(queryset[key])){ if (Array.isArray(queryset[key])){
@@ -177,18 +180,6 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', '
delete queryset[key]; delete queryset[key];
} }
} }
if(queryset.search && queryset.search){
if (Array.isArray(queryset.search)){
_.remove(queryset.search, (item) => item.indexOf(value) > -1);
// If the array is now empty, remove that key
if(queryset.search.length === 0) {
delete queryset.search;
}
}
else if(queryset.search.indexOf(key) > -1){
delete queryset.search;
}
}
else { else {
delete queryset[key]; delete queryset[key];
} }