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

Merge pull request #4704 from jaredevantabor/copy-move-group

Browse Source 
Copy move group
This commit is contained in:
Jared Tabor
2017-01-12 17:00:05 -08:00
committed by GitHub
parent d5ce044e8d abb2e93bb6
commit b24193d0c1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/inventories/manage/copy-move/copy-move-groups.controller.js
View File

@@ -60,9 +60,6 @@
}; };
function init(){ 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; $scope.atRootLevel = $stateParams.group ? false : true;
// search init // search init

10
awx/ui/client/src/inventories/manage/copy-move/copy-move.route.js
View File

@@ -30,8 +30,8 @@ var copyMoveGroupRoute = {
resolve: { resolve: {
Dataset: ['CopyMoveGroupList', 'QuerySet', '$stateParams', 'GetBasePath', 'group', Dataset: ['CopyMoveGroupList', 'QuerySet', '$stateParams', 'GetBasePath', 'group',
function(list, qs, $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); $stateParams.copy_search.not__id__in = ($stateParams.group && $stateParams.group.length > 0 ? group.id + ',' + _.last($stateParams.group) : group.id.toString());
let path = GetBasePath(list.name); let path = GetBasePath('inventory') + $stateParams.inventory_id + '/groups/';
return qs.search(path, $stateParams.copy_search); return qs.search(path, $stateParams.copy_search);
} }
], ],
@@ -66,7 +66,7 @@ var copyMoveHostRoute = {
resolve: { resolve: {
Dataset: ['CopyMoveGroupList', 'QuerySet', '$stateParams', 'GetBasePath', Dataset: ['CopyMoveGroupList', 'QuerySet', '$stateParams', 'GetBasePath',
function(list, qs, $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); return qs.search(path, $stateParams.copy_search);
} }
], ],
@@ -80,7 +80,9 @@ var copyMoveHostRoute = {
controller: CopyMoveHostsController, controller: CopyMoveHostsController,
}, },
'copyMoveList@inventoryManage.copyMoveHost': { '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({ let html = generateList.build({
list: CopyMoveGroupList, list: CopyMoveGroupList,
mode: 'lookup', mode: 'lookup',

3
awx/ui/client/src/lists/Groups.js
View File

@@ -22,5 +22,6 @@ export default
key: true, key: true,
label: 'Target Group Name' label: 'Target Group Name'
} }
} },
basePath: 'api/v1/inventories/{{$stateParams.inventory_id}}/groups'
}); });