github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-05 17:01:21 +00:00
Code Issues Projects Releases Wiki Activity

fix: user list perm

Browse Source
This commit is contained in:
feng626
2022-03-04 17:13:48 +08:00
committed by huailei
parent c48e1603b9
commit c8825e52b6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/users/Role/RoleDetail/RoleInfo.vue
View File

@@ -108,7 +108,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.setting.treeUrl = `/api/v1/rbac/roles/${this.object.id}/permissions/tree/` this.setting.treeUrl = `/api/v1/rbac/${this.object.scope}-roles/${this.object.id}/permissions/tree/`
setTimeout(() => { setTimeout(() => {
this.loading = false this.loading = false
}) })

6
src/views/users/User/UserList.vue
View File

@@ -251,15 +251,17 @@ export default {
}, },
methods: { methods: {
setRolesFilter() { setRolesFilter() {
const roleTypes = ['system-roles', 'org-roles'] const roleTypes = [{ name: 'system-roles', perm: 'systemrole' }, { name: 'org-roles', perm: 'orgrole' }]
for (const roleType of roleTypes) { for (const roleType of roleTypes) {
if (this.$hasPerm(`rbac.${roleType.perm}`)) {
this.$axios.get(`/api/v1/rbac/${roleType}/`).then((roles) => { this.$axios.get(`/api/v1/rbac/${roleType}/`).then((roles) => {
const fieldName = roleType.replace('-', '_') const fieldName = roleType.name.replace('-', '_')
this.tableConfig.columnsMeta[fieldName].filters = roles.map(r => { this.tableConfig.columnsMeta[fieldName].filters = roles.map(r => {
return { text: r['display_name'], value: r.id } return { text: r['display_name'], value: r.id }
}) })
}) })
} }
}
}, },
removeUserFromOrg({ row, col, reload }) { removeUserFromOrg({ row, col, reload }) {
const url = `/api/v1/users/users/${row.id}/remove/` const url = `/api/v1/users/users/${row.id}/remove/`