diff --git a/src/components/AppAccountListTable/index.vue b/src/components/AppAccountListTable/index.vue index 2aae78a94..cf8cd7bca 100644 --- a/src/components/AppAccountListTable/index.vue +++ b/src/components/AppAccountListTable/index.vue @@ -48,8 +48,8 @@ export default { tableConfig: { url: this.url, columns: [ - 'app_name', 'username', 'app_category_display', - 'app_type_display', 'systemuser', 'actions' + 'app_name', 'username', 'category_display', + 'type_display', 'systemuser', 'actions' ], columnsMeta: { app_name: { diff --git a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue index 8f098030e..45d93d935 100644 --- a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue +++ b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue @@ -33,15 +33,16 @@ export default { onSelected: function(event, treeNode) { let url = '/api/v1/applications/accounts/' const nodeId = treeNode.id + const value = treeNode.meta.data?.value if (treeNode.meta.type === 'category') { - url = setUrlParam(url, 'app_category', nodeId) - url = setUrlParam(url, 'app_type', '') + url = setUrlParam(url, 'category', value) + url = setUrlParam(url, 'type', '') } else if (treeNode.meta.type === 'type') { - url = setUrlParam(url, 'app_category', '') - url = setUrlParam(url, 'app_type', nodeId) + url = setUrlParam(url, 'category', '') + url = setUrlParam(url, 'type', value) } else if (treeNode.meta.type === 'application') { - url = setUrlParam(url, 'app_category', '') - url = setUrlParam(url, 'app_type', '') + url = setUrlParam(url, 'category', '') + url = setUrlParam(url, 'type', '') url = setUrlParam(url, 'app', nodeId) } setTimeout(() => { diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue index 6dfad47d4..e6560eb6b 100644 --- a/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue +++ b/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue @@ -29,16 +29,17 @@ export default { onSelected: function(event, treeNode) { let url = '/api/v1/perms/application-permissions/' const nodeId = treeNode.id + const value = treeNode.meta.data?.value if (treeNode.meta.type === 'category') { - url = setUrlParam(url, 'category', nodeId) + url = setUrlParam(url, 'category', value) url = setUrlParam(url, 'type', '') } else if (treeNode.meta.type === 'type') { url = setUrlParam(url, 'category', '') - url = setUrlParam(url, 'type', nodeId) + url = setUrlParam(url, 'type', value) } else if (treeNode.meta.type === 'application') { url = setUrlParam(url, 'category', '') url = setUrlParam(url, 'type', '') - url = setUrlParam(url, 'application_id', nodeId) + url = setUrlParam(url, 'app', nodeId) } setTimeout(() => { vm.tableConfig.url = url