External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6849 from mabashian/6766-hide-disassociate-host

Browse Source 
Hide disassociate host from non directly associated group
This commit is contained in:
Michael Abashian
2017-07-01 22:07:07 -04:00
committed by GitHub
parent 78ef0c06d2 708d0698bc
commit 8ed1091f44
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,11 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat
$scope.$watchCollection(list.name, function() { $scope.$watchCollection(list.name, function() {
$scope[list.name] = _.map($scope.nested_hosts, function(value) { $scope[list.name] = _.map($scope.nested_hosts, function(value) {
value.inventory_name = value.summary_fields.inventory.name; angular.forEach(value.summary_fields.groups.results, function(directParentGroup) {
value.inventory_id = value.summary_fields.inventory.id; if(directParentGroup.id === parseInt($state.params.group_id)) {
value.can_disassociate = true;
}
});
return value; return value;
}); });
setJobStatus(); setJobStatus();
@@ -72,7 +75,7 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat
} }
function setJobStatus(){ function setJobStatus(){
_.forEach($scope.hosts, function(value) { _.forEach($scope.nested_hosts, function(value) {
SetStatus({ SetStatus({
scope: $scope, scope: $scope,
host: value host: value

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

@@ -89,7 +89,7 @@ export default {
icon: 'icon-trash', icon: 'icon-trash',
awToolTip: 'Disassociate host', awToolTip: 'Disassociate host',
dataPlacement: 'top', dataPlacement: 'top',
ngShow: 'nested_host.summary_fields.user_capabilities.delete' ngShow: 'nested_host.summary_fields.user_capabilities.delete && nested_host.can_disassociate'
} }
}, },