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

Hide smart inv button when no hosts exist. Updated disassociate tooltip. Filtered out the target group when associating existing groups

Browse Source
This commit is contained in:
Michael Abashian
2017-06-23 09:14:09 -04:00
parent 6143d275d6
commit af31c7972c
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/inventories-hosts/hosts/host.list.js
View File

@@ -110,7 +110,7 @@ export default ['i18n', function(i18n) {
awToolTip: "Create a new Smart Inventory from search results.", awToolTip: "Create a new Smart Inventory from search results.",
actionClass: 'btn List-buttonDefault', actionClass: 'btn List-buttonDefault',
buttonContent: 'SMART INVENTORY', buttonContent: 'SMART INVENTORY',
ngShow: 'canAdd', ngShow: 'canAdd && (hosts.length > 0 || !(searchTags | isEmpty))',
dataPlacement: "top", dataPlacement: "top",
ngDisabled: '!enableSmartInventoryButton' ngDisabled: '!enableSmartInventoryButton'
} }

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

@@ -99,7 +99,7 @@ export default {
//label: 'Delete', //label: 'Delete',
mode: 'all', mode: 'all',
ngClick: "disassociateGroup(nested_group)", ngClick: "disassociateGroup(nested_group)",
awToolTip: 'Delete group', awToolTip: 'Disassociate group',
dataPlacement: "top", dataPlacement: "top",
ngShow: "nested_group.summary_fields.user_capabilities.delete" ngShow: "nested_group.summary_fields.user_capabilities.delete"
} }

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

@@ -23,6 +23,11 @@
page_size: 5 page_size: 5
}; };
if($state.params.group_id) {
$scope.associate_group_default_params.not__id = $state.params.group_id;
$scope.associate_group_queryset.not__id = $state.params.group_id;
}
let list = _.cloneDeep(GroupList); let list = _.cloneDeep(GroupList);
list.basePath = GetBasePath('inventory') + $state.params.inventory_id + '/groups'; list.basePath = GetBasePath('inventory') + $state.params.inventory_id + '/groups';
list.iterator = 'associate_group'; list.iterator = 'associate_group';