From 47237733544ded083abc680bab9508ba7fd38d09 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Thu, 29 Nov 2018 16:57:52 -0500 Subject: [PATCH] Fix instance group modal selection --- .../instance-groups-modal.directive.js | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js index b28a6681c0..078081d57c 100644 --- a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js +++ b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js @@ -65,8 +65,13 @@ export default ['templateUrl', '$window', function(templateUrl, $window) { $('#instance-groups-modal-body').append($compile(html)($scope)); if ($scope.instanceGroups) { - $scope.instance_groups.map( (item) => { - isSelected(item); + $scope.instanceGroups = $scope.instanceGroups.map( (item) => { + item.isSelected = true; + if (!$scope.igTags) { + $scope.igTags = []; + } + $scope.igTags.push(item); + return item; }); } @@ -82,22 +87,10 @@ export default ['templateUrl', '$window', function(templateUrl, $window) { }); }); }); - } init(); - function isSelected(item) { - if(_.find($scope.instanceGroups, {id: item.id})){ - item.isSelected = true; - if (!$scope.igTags) { - $scope.igTags = []; - } - $scope.igTags.push(item); - } - return item; - } - $scope.$on("selectedOrDeselected", function(e, value) { let item = value.value; if (value.isSelected) {