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

Merge pull request #1999 from jaredevantabor/fix-1927

Browse Source 
Fixes URL used for root groups for pagination purposes
This commit is contained in:
Jared Tabor 2018-05-31 14:14:49 -07:00 committed by GitHub
commit e2d3a7be26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js
View File

@ -54,7 +54,7 @@ export default {
}
else {
//reaches here if the user is on the root level group
list.basePath = GetBasePath('inventory') + $stateParams.inventory_id + '/root_groups';
list.basePath = GetBasePath('inventory') + $stateParams.inventory_id + '/groups';
}
let html = generateList.build({

4
awx/ui/client/src/inventories-hosts/shared/inventories.service.js
View File

@ -52,8 +52,8 @@
var url = GetBasePath('groups') + id + '/children';
return url;
},
rootGroupsUrl: function(id){
var url = GetBasePath('inventory') + id+ '/root_groups';
groupsUrl: function(id){
var url = GetBasePath('inventory') + id+ '/groups';
return url;
},
inventorySourcesOptions: function(inventoryId) {