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

Merge pull request #7144 from mabashian/6954-host-associate

Browse Source 
Fixed group/host association across pages
This commit is contained in:
Michael Abashian
2017-07-18 17:41:14 -04:00
committed by GitHub
parent e1e1f5d15f f3695be11d
commit 4eaa12dd48
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js
View File

@@ -63,12 +63,10 @@
$scope.$watchCollection('associate_groups', function () { $scope.$watchCollection('associate_groups', function () {
if($scope.selectedItems) { if($scope.selectedItems) {
$scope.associate_groups.forEach(function(row, i) { $scope.associate_groups.forEach(function(row, i) {
$scope.selectedItems.forEach(function(selectedItem) { if ($scope.selectedItems.filter(function(e) { return e.id === row.id; }).length > 0) {
if(selectedItem.id === row.id) {
$scope.associate_groups[i].isSelected = true; $scope.associate_groups[i].isSelected = true;
} }
}); });
});
} }
}); });

2
awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.controller.js
View File

@@ -60,7 +60,7 @@
$scope.$watchCollection('associate_hosts', function () { $scope.$watchCollection('associate_hosts', function () {
if($scope.selectedItems) { if($scope.selectedItems) {
$scope.associate_hosts.forEach(function(row, i) { $scope.associate_hosts.forEach(function(row, i) {
if (_.includes($scope.selectedItems, row.id)) { if ($scope.selectedItems.filter(function(e) { return e.id === row.id; }).length > 0) {
$scope.associate_hosts[i].isSelected = true; $scope.associate_hosts[i].isSelected = true;
} }
}); });