From 0193377d18418f9b05a4b93bfafa334ef2e34200 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 27 Sep 2017 09:54:00 -0400 Subject: [PATCH 1/4] Fixed nested groups pagination --- .../groups/related/nested-groups/group-nested-groups.list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js index 22f65aac94..e1ec1e3cf0 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js @@ -15,7 +15,7 @@ hover: true, multiSelect: true, trackBy: 'nested_group.id', - basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', + basePath: '/api/v2/groups/{{$stateParams.group_id}}/children', fields: { failed_hosts: { From 6c19bbb6debc851c983f169533644f89b7fe8e0b Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 27 Sep 2017 10:00:28 -0400 Subject: [PATCH 2/4] Added trailing slash to basePath --- .../groups/related/nested-groups/group-nested-groups.list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js index e1ec1e3cf0..5582e76d22 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js @@ -15,7 +15,7 @@ hover: true, multiSelect: true, trackBy: 'nested_group.id', - basePath: '/api/v2/groups/{{$stateParams.group_id}}/children', + basePath: '/api/v2/groups/{{$stateParams.group_id}}/children/', fields: { failed_hosts: { From 61b741030da3ed137571a6fe076d8ab2e2c60df8 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 27 Sep 2017 10:34:55 -0400 Subject: [PATCH 3/4] Fixed host nested groups pagination --- .../hosts/related/nested-groups/host-nested-groups.list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js index 62bef5d028..a41e3399f5 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js @@ -15,7 +15,7 @@ hover: true, multiSelect: true, trackBy: 'nested_group.id', - basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', + basePath: 'api/v2/hosts/{{$stateParams.host_id}}/all_groups/', fields: { failed_hosts: { From cfe8a6580b9195e1f435ffd6859fa03ccf475654 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 27 Sep 2017 10:40:49 -0400 Subject: [PATCH 4/4] Removed leading slash on basePath --- .../groups/related/nested-groups/group-nested-groups.list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js index 5582e76d22..8e738f1d37 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js @@ -15,7 +15,7 @@ hover: true, multiSelect: true, trackBy: 'nested_group.id', - basePath: '/api/v2/groups/{{$stateParams.group_id}}/children/', + basePath: 'api/v2/groups/{{$stateParams.group_id}}/children/', fields: { failed_hosts: {