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

Merge pull request #78 from mabashian/7266-run-commands

Browse Source 
Maintain selected host/group rows on pagination and search changes
This commit is contained in:
Michael Abashian
2017-07-27 08:54:40 -04:00
committed by GitHub
parent 453a418ee3 d1e7e8d237
commit fde3e41042
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js
View File

@@ -33,7 +33,7 @@
$scope.inventory_id = $stateParams.inventory_id; $scope.inventory_id = $stateParams.inventory_id;
$scope.$watchCollection(list.name, function(){ $scope.$watchCollection(list.name, function(){
_.forEach($scope[list.name], buildStatusIndicators); _.forEach($scope[list.name], processRow);
}); });
$scope.$on('selectedOrDeselected', function(e, value) { $scope.$on('selectedOrDeselected', function(e, value) {
@@ -54,11 +54,17 @@
} }
function buildStatusIndicators(group){ function processRow(group){
if (group === undefined || group === null) { if (group === undefined || group === null) {
group = {}; group = {};
} }
angular.forEach($scope.groupsSelected, function(selectedGroup){
if(selectedGroup.id === group.id) {
group.isSelected = true;
}
});
let hosts_status; let hosts_status;
hosts_status = GetHostsStatusMsg({ hosts_status = GetHostsStatusMsg({

10
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js
View File

@@ -34,7 +34,7 @@
$scope.inventory_id = $stateParams.inventory_id; $scope.inventory_id = $stateParams.inventory_id;
$scope.$watchCollection(list.name, function(){ $scope.$watchCollection(list.name, function(){
_.forEach($scope[list.name], buildStatusIndicators); _.forEach($scope[list.name], processRow);
}); });
$scope.$on('selectedOrDeselected', function(e, value) { $scope.$on('selectedOrDeselected', function(e, value) {
@@ -55,11 +55,17 @@
} }
function buildStatusIndicators(group){ function processRow(group){
if (group === undefined || group === null) { if (group === undefined || group === null) {
group = {}; group = {};
} }
angular.forEach($scope.groupsSelected, function(selectedGroup){
if(selectedGroup.id === group.id) {
group.isSelected = true;
}
});
let hosts_status; let hosts_status;
hosts_status = GetHostsStatusMsg({ hosts_status = GetHostsStatusMsg({

5
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js
View File

@@ -34,6 +34,11 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat
value.can_disassociate = true; value.can_disassociate = true;
} }
}); });
angular.forEach($scope.hostsSelected, function(selectedHost){
if(selectedHost.id === value.id) {
value.isSelected = true;
}
});
return value; return value;
}); });
setJobStatus(); setJobStatus();

5
awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js
View File

@@ -31,6 +31,11 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath',
$scope[list.name] = _.map($scope.hosts, function(value) { $scope[list.name] = _.map($scope.hosts, function(value) {
value.inventory_name = value.summary_fields.inventory.name; value.inventory_name = value.summary_fields.inventory.name;
value.inventory_id = value.summary_fields.inventory.id; value.inventory_id = value.summary_fields.inventory.id;
angular.forEach($scope.hostsSelected, function(selectedHost){
if(selectedHost.id === value.id) {
value.isSelected = true;
}
});
return value; return value;
}); });
setJobStatus(); setJobStatus();