From a52d686306c6c8e8b7c51b3d48d6a195b54711be Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Fri, 10 Jun 2016 10:01:24 -0400 Subject: [PATCH 1/2] Fixed bug where search dropdown was not being hidden when one of the dropdown items was selected. --- awx/ui/client/src/search/tagSearch.controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/search/tagSearch.controller.js b/awx/ui/client/src/search/tagSearch.controller.js index 3595db3712..d00d7b8403 100644 --- a/awx/ui/client/src/search/tagSearch.controller.js +++ b/awx/ui/client/src/search/tagSearch.controller.js @@ -19,9 +19,10 @@ export default ['$scope', 'Refresh', 'tagSearchService', }; // sets the search type dropdown and hides it - $scope.setSearchType = function(type) { + $scope.setSearchType = function($event, type) { $scope.currentSearchType = type; $scope.showTypeDropdown = false; + $event.stopPropagation(); }; // if the current search type uses a list instead From 9ad581014047a26dd46c146eb13bb42c00717712 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Mon, 13 Jun 2016 16:23:23 -0400 Subject: [PATCH 2/2] Have to pass the $event in order to stop bubbling --- awx/ui/client/src/search/tagSearch.partial.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/search/tagSearch.partial.html b/awx/ui/client/src/search/tagSearch.partial.html index 775fad1d41..e5a675e0af 100644 --- a/awx/ui/client/src/search/tagSearch.partial.html +++ b/awx/ui/client/src/search/tagSearch.partial.html @@ -16,7 +16,7 @@
+ ng-click="setSearchType($event, type)"> {{ type.label }}