diff --git a/awx/ui/client/src/inventories/manage/copy-move/copy-move-groups.controller.js b/awx/ui/client/src/inventories/manage/copy-move/copy-move-groups.controller.js index 9231e7a5b2..8c5549addb 100644 --- a/awx/ui/client/src/inventories/manage/copy-move/copy-move-groups.controller.js +++ b/awx/ui/client/src/inventories/manage/copy-move/copy-move-groups.controller.js @@ -60,9 +60,6 @@ }; function init(){ - var url = GetBasePath('inventory') + $stateParams.inventory_id + '/groups/'; - url += $stateParams.group ? '?not__id__in=' + group.id + ',' + _.last($stateParams.group) : '?not__id=' + group.id; - list.basePath = url; $scope.atRootLevel = $stateParams.group ? false : true; // search init diff --git a/awx/ui/client/src/inventories/manage/copy-move/copy-move.route.js b/awx/ui/client/src/inventories/manage/copy-move/copy-move.route.js index f15705778d..b93e5e1e0f 100644 --- a/awx/ui/client/src/inventories/manage/copy-move/copy-move.route.js +++ b/awx/ui/client/src/inventories/manage/copy-move/copy-move.route.js @@ -30,8 +30,8 @@ var copyMoveGroupRoute = { resolve: { Dataset: ['CopyMoveGroupList', 'QuerySet', '$stateParams', 'GetBasePath', 'group', function(list, qs, $stateParams, GetBasePath, group) { - $stateParams.copy_search.not__id__in = ($stateParams.group.length > 0 ? group.id + ',' + _.last($stateParams.group) : group.id); - let path = GetBasePath(list.name); + $stateParams.copy_search.not__id__in = ($stateParams.group && $stateParams.group.length > 0 ? group.id + ',' + _.last($stateParams.group) : group.id.toString()); + let path = GetBasePath('inventory') + $stateParams.inventory_id + '/groups/'; return qs.search(path, $stateParams.copy_search); } ], @@ -66,7 +66,7 @@ var copyMoveHostRoute = { resolve: { Dataset: ['CopyMoveGroupList', 'QuerySet', '$stateParams', 'GetBasePath', function(list, qs, $stateParams, GetBasePath) { - let path = GetBasePath(list.name); + let path = GetBasePath('inventory') + $stateParams.inventory_id + '/hosts/'; return qs.search(path, $stateParams.copy_search); } ], @@ -80,7 +80,9 @@ var copyMoveHostRoute = { controller: CopyMoveHostsController, }, 'copyMoveList@inventoryManage.copyMoveHost': { - templateProvider: function(CopyMoveGroupList, generateList) { + templateProvider: function(CopyMoveGroupList, generateList, $stateParams, GetBasePath) { + let list = CopyMoveGroupList; + list.basePath = GetBasePath('inventory') + $stateParams.inventory_id + '/hosts/'; let html = generateList.build({ list: CopyMoveGroupList, mode: 'lookup', diff --git a/awx/ui/client/src/lists/Groups.js b/awx/ui/client/src/lists/Groups.js index 0bfc6a9f3f..205adde477 100644 --- a/awx/ui/client/src/lists/Groups.js +++ b/awx/ui/client/src/lists/Groups.js @@ -22,5 +22,6 @@ export default key: true, label: 'Target Group Name' } - } + }, + basePath: 'api/v1/inventories/{{$stateParams.inventory_id}}/groups' });