github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-29 21:28:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1934 from jumpserver/dev

Browse Source 
v2.24.0-rc1
This commit is contained in:
Jiangjie.Bai
2022-07-14 18:27:51 +08:00
committed by GitHub
parent 6f25d93909 fa74dad83d
commit 1731f4f788
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/store/getters.js
View File

@@ -7,6 +7,7 @@ const getters = {
consoleOrgs: state => state.users.consoleOrgs,
auditOrgs: state => state.users.auditOrgs,
workbenchOrgs: state => state.users.workbenchOrgs,
notRootWorkbenchOrgs: state => state.users.notRootWorkbenchOrgs,
usingOrgs: state => state.users.usingOrgs,
currentOrg: state => state.users.currentOrg,
currentOrgIsDefault: state => state.users.currentOrg['is_default'],

4
src/store/modules/users.js
View File

@@ -17,6 +17,7 @@ const getDefaultState = () => {
auditOrgs: [],
consoleOrgs: [],
workbenchOrgs: [],
notRootWorkbenchOrgs: [],
usingOrgs: [],
perms: [],
MFAVerifyAt: null,
@@ -42,6 +43,9 @@ const mutations = {
state.perms = profile.perms
state.consoleOrgs = profile['console_orgs']
state.workbenchOrgs = profile['workbench_orgs']
state.notRootWorkbenchOrgs = profile['workbench_orgs'].filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})
state.auditOrgs = profile['audit_orgs']
state.currentOrg = getCurrentOrgLocal(profile.username)
},

8
src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
View File

@@ -127,9 +127,7 @@ export default {
component: Select2,
el: {
multiple: false,
options: this.$store.state.users.workbenchOrgs.filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})?.map((item) => {
options: this.$store.state.users.notRootWorkbenchOrgs?.map((item) => {
return { label: item.name, value: item.id }
})
},
@@ -163,9 +161,7 @@ export default {
},
computed: {
...mapState({
workbenchOrgs: state => state.users.workbenchOrgs.filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})
workbenchOrgs: state => state.users.notRootWorkbenchOrgs
}),
...mapGetters(['currentOrg'])
},

8
src/views/tickets/RequestAssetPerm/CreateUpdate.vue
View File

@@ -105,9 +105,7 @@ export default {
component: Select2,
el: {
multiple: false,
options: this.$store.state.users.workbenchOrgs.filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})?.map((item) => {
options: this.$store.state.users.notRootWorkbenchOrgs?.map((item) => {
return { label: item.name, value: item.id }
})
},
@@ -137,9 +135,7 @@ export default {
},
computed: {
...mapState({
workbenchOrgs: state => state.users.workbenchOrgs.filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})
workbenchOrgs: state => state.users.notRootWorkbenchOrgs
}),
...mapGetters(['currentOrg'])
},