github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-15 14:24:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105 from jumpserver/dev

Browse Source 
[fix]fix bugs
This commit is contained in:
Orange
2020-06-18 19:35:10 +08:00
committed by GitHub
parent a79af0a7c4 65855b3e07
commit 4be2db93c7
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lina.tar.gz
View File

Binary file not shown.

19
src/store/modules/permission.js
View File

@@ -28,15 +28,16 @@ function hasLicense(licState, route) {
return licState === requireLic
}
function hasCommand(cmdState, route) {
if (cmdState) {
return cmdState
function hasCommand(cmdBulkExecutionEnable, route) {
const routeRequireCmd = route.meta ? route.meta.commandExecutionRequired : false
if (!routeRequireCmd) {
return true
}
let requireCmd = route.meta ? route.meta.commandExecutionRequired : null
if (!requireCmd) {
requireCmd = false
if (!cmdBulkExecutionEnable) {
return false
}
return cmdState === requireCmd
return true
}
export function filterLicRoutes(routes, roles) {
@@ -113,10 +114,12 @@ const mutations = {
const actions = {
generateRoutes({ commit, rootState }, roles) {
return new Promise(resolve => {
console.log(rootState)
let accessedRoutes = filterAsyncRoutes(allRoleRoutes, roles)
accessedRoutes = filterCmdRoutes(accessedRoutes, rootState.settings.publicSettings.SECURITY_COMMAND_EXECUTION)
accessedRoutes = filterLicRoutes(accessedRoutes, rootState.settings.publicSettings.XPACK_LICENSE_IS_VALID)
if (accessedRoutes.length === 0) {
console.log('No route find')
}
commit('SET_ROUTES', accessedRoutes)
resolve(accessedRoutes)
})