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

Hide disassociate host from group when the host is not directly associated with the currently viewed group

Browse Source
This commit is contained in:
Michael Abashian 2017-06-30 18:56:03 -04:00
parent 8c834daf46
commit 708d0698bc
2 changed files with 7 additions and 4 deletions
Show Stats 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[list.name] = _.map($scope.nested_hosts, function(value) {
value.inventory_name = value.summary_fields.inventory.name;
value.inventory_id = value.summary_fields.inventory.id;
angular.forEach(value.summary_fields.groups.results, function(directParentGroup) {
if(directParentGroup.id === parseInt($state.params.group_id)) {
value.can_disassociate = true;
}
});
return value;
});
setJobStatus();
@ -72,7 +75,7 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat
}
function setJobStatus(){
_.forEach($scope.hosts, function(value) {
_.forEach($scope.nested_hosts, function(value) {
SetStatus({
scope: $scope,
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',
awToolTip: 'Disassociate host',
dataPlacement: 'top',
ngShow: 'nested_host.summary_fields.user_capabilities.delete'
ngShow: 'nested_host.summary_fields.user_capabilities.delete && nested_host.can_disassociate'
}
},