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

Merge pull request #6850 from mabashian/6760-host-link

Browse Source 
Fixed linkout associate group/host name
This commit is contained in:
Michael Abashian 2017-07-01 22:07:50 -04:00 committed by GitHub
commit a03d368e85
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@
list.iterator = 'associate_group';
list.name = 'associate_groups';
list.multiSelect = true;
list.fields.name.ngClick = 'linkoutGroup(associate_group.id)';
list.fields.name.ngClick = 'linkoutGroup(associate_group)';
list.trackBy = 'associate_group.id';
list.multiSelectPreview = {
selectedRows: 'selectedItems',
@ -107,10 +107,8 @@
};
$scope.linkoutGroup = function(userId) {
// Open the edit user form in a new tab so as not to navigate the user
// away from the modal
$window.open('/#/users/' + userId,'_blank');
$scope.linkoutGroup = function(group) {
$window.open('/#/inventories/inventory/' + group.inventory + '/groups/edit/' + group.id,'_blank');
};
});
}];

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

@ -28,7 +28,7 @@
list.iterator = 'associate_host';
list.name = 'associate_hosts';
list.multiSelect = true;
list.fields.name.ngClick = 'linkoutHost(associate_host.id)';
list.fields.name.ngClick = 'linkoutHost(associate_host)';
list.trackBy = 'associate_host.id';
delete list.fields.toggleHost;
delete list.fields.active_failures;
@ -98,10 +98,8 @@
};
$scope.linkoutHost = function(userId) {
// Open the edit user form in a new tab so as not to navigate the user
// away from the modal
$window.open('/#/users/' + userId,'_blank');
$scope.linkoutHost = function(host) {
$window.open('/#/inventories/inventory/' + host.inventory + '/hosts/edit/' + host.id,'_blank');
};
});
}];