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

AC-286 Now using /api/v1/groups/N/potential_children to build list of possible groups for copy.

Browse Source
This commit is contained in:
chouseknecht
2013-10-15 21:14:57 +00:00
parent 0115aab703
commit 1cda0dd1a9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/static/js/helpers/Groups.js
View File

@@ -70,6 +70,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
ProcessErrors, GetBasePath, GroupsAdd, RefreshTree, SelectionInit) {
return function(params) {
// build and present the list of groups we can add to an existing group
var inventory_id = params.inventory_id;
var group_id = (params.group_id !== undefined) ? params.group_id : null;
@@ -92,8 +94,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
$('.popover').popover('hide'); //remove any lingering pop-overs
$('#form-modal .btn-none').removeClass('btn-none').addClass('btn-success');
$('#form-modal').modal({ backdrop: 'static', keyboard: false });
var url = (group_id) ? GetBasePath('groups') + group_id + '/children/' :
var url = (group_id) ? GetBasePath('groups') + group_id + '/potential_children/' :
GetBasePath('inventory') + inventory_id + '/groups/';
SelectionInit({ scope: scope, list: list, url: url });
@@ -140,6 +142,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
}
}
/* Now using /potential_children resource, so should not need to do this any longer.
if (scope.PostRefreshRemove) {
scope.PostRefreshRemove();
}
@@ -150,9 +153,10 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
}
}
});
*/
SearchInit({ scope: scope, set: 'groups', list: list, url: defaultUrl });
PaginateInit({ scope: scope, list: list, url: defaultUrl, mode: 'lookup' });
SearchInit({ scope: scope, set: 'groups', list: list, url: url });
PaginateInit({ scope: scope, list: list, url: url, mode: 'lookup' });
scope.search(list.iterator);
if (!scope.$$phase) {