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

Merge pull request #2845 from marshmalien/fix-org-ig-modal

Browse Source 
Fix instance group modal selection

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-12-04 15:42:49 +00:00
committed by GitHub
parent 70be95cec5 4723773354
commit f6b075843e
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js
View File

@@ -65,8 +65,13 @@ export default ['templateUrl', '$window', function(templateUrl, $window) {
$('#instance-groups-modal-body').append($compile(html)($scope)); $('#instance-groups-modal-body').append($compile(html)($scope));
if ($scope.instanceGroups) { if ($scope.instanceGroups) {
$scope.instance_groups.map( (item) => { $scope.instanceGroups = $scope.instanceGroups.map( (item) => {
isSelected(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(); 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) { $scope.$on("selectedOrDeselected", function(e, value) {
let item = value.value; let item = value.value;
if (value.isSelected) { if (value.isSelected) {