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

Fixed linkout associate group/host name

Browse Source
This commit is contained in:
Michael Abashian
2017-06-30 19:18:12 -04:00
parent 8c834daf46
commit 9eda282e8d
2 changed files with 6 additions and 10 deletions
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.iterator = 'associate_group';
list.name = 'associate_groups'; list.name = 'associate_groups';
list.multiSelect = true; list.multiSelect = true;
list.fields.name.ngClick = 'linkoutGroup(associate_group.id)'; list.fields.name.ngClick = 'linkoutGroup(associate_group)';
list.trackBy = 'associate_group.id'; list.trackBy = 'associate_group.id';
list.multiSelectPreview = { list.multiSelectPreview = {
selectedRows: 'selectedItems', selectedRows: 'selectedItems',
@@ -106,10 +106,8 @@
}; };
$scope.linkoutGroup = function(userId) { $scope.linkoutGroup = function(group) {
// Open the edit user form in a new tab so as not to navigate the user $window.open('/#/inventories/inventory/' + group.inventory + '/groups/edit/' + group.id,'_blank');
// away from the modal
$window.open('/#/users/' + userId,'_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.iterator = 'associate_host';
list.name = 'associate_hosts'; list.name = 'associate_hosts';
list.multiSelect = true; list.multiSelect = true;
list.fields.name.ngClick = 'linkoutHost(associate_host.id)'; list.fields.name.ngClick = 'linkoutHost(associate_host)';
list.trackBy = 'associate_host.id'; list.trackBy = 'associate_host.id';
delete list.fields.toggleHost; delete list.fields.toggleHost;
delete list.fields.active_failures; delete list.fields.active_failures;
@@ -97,10 +97,8 @@
}; };
$scope.linkoutHost = function(userId) { $scope.linkoutHost = function(host) {
// Open the edit user form in a new tab so as not to navigate the user $window.open('/#/inventories/inventory/' + host.inventory + '/hosts/edit/' + host.id,'_blank');
// away from the modal
$window.open('/#/users/' + userId,'_blank');
}; };
}); });
}]; }];