From 2a8bff824a237f59891338d2c21d468004e92902 Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Wed, 8 Feb 2017 11:57:01 -0800 Subject: [PATCH] fixing deletion after PR feedback from mabashian --- .../smart-search/smart-search.controller.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js index e16485550f..b16a2a3893 100644 --- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js +++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js @@ -166,8 +166,11 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', ' else { encodeParams.searchTerm = true; } + removed = qs.encodeParam(encodeParams); + } + else { + removed = setDefaults(termParts[termParts.length-1]); } - removed = qs.encodeParam(encodeParams); } _.each(removed, (value, key) => { if (Array.isArray(queryset[key])){ @@ -177,18 +180,6 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', ' 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 { delete queryset[key]; }