From a484dae41ae16fe5e7df64cf8ba54793c9e17193 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Wed, 22 Feb 2017 14:59:54 -0500 Subject: [PATCH] Fix for deleting search tags on job details --- .../smart-search/smart-search.controller.js | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 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 506613c125..41b4071db2 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,18 +166,23 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', ' let encodeParams = { term: tagToRemove }; - if(_.has($scope.models[$scope.list.name].base, root)) { - if($scope.models[$scope.list.name].base[root].type && $scope.models[$scope.list.name].base[root].type === 'field') { + if($scope.models[$scope.list.name]) { + if(_.has($scope.models[$scope.list.name].base, root)) { + if($scope.models[$scope.list.name].base[root].type && $scope.models[$scope.list.name].base[root].type === 'field') { + encodeParams.relatedSearchTerm = true; + } + else { + encodeParams.searchTerm = true; + } + removed = qs.encodeParam(encodeParams); + } + else if(_.contains($scope.models[$scope.list.name].related, root)) { encodeParams.relatedSearchTerm = true; + removed = qs.encodeParam(encodeParams); } else { - encodeParams.searchTerm = true; + removed = setDefaults(termParts[termParts.length-1]); } - removed = qs.encodeParam(encodeParams); - } - else if(_.contains($scope.models[$scope.list.name].related, root)) { - encodeParams.relatedSearchTerm = true; - removed = qs.encodeParam(encodeParams); } else { removed = setDefaults(termParts[termParts.length-1]);