diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 1d1dc4313dd5a584d0b278f26ac79fcb8feb8efd..145e11395bcab42fc312922bc0ee0b55db8f0052 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -106,7 +106,7 @@ const user = { if (is_admin) { commit('SET_ROLES', ['admin']) } - commit('SET_PRIVILEGES', data.pleroma.privileges) + commit('SET_PRIVILEGES', data.pleroma.privileges || []) } else { reject(message) } diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue index 910ed1f2b9a1d1e7ce07bdfd7abdeaa8ee742f9d..5a730aee4c6909823ab133ae1dd7c7ab4509d466 100644 --- a/src/views/layout/components/Sidebar/index.vue +++ b/src/views/layout/components/Sidebar/index.vue @@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only mode="vertical" @open="handleOpen" > - <sidebar-item v-for="route in permission_routers" v-if="isPrivileged(route)" :key="route.path" :item="route" :base-path="route.path"/> + <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path"/> </el-menu> </el-scrollbar> </template> @@ -61,17 +61,6 @@ export default { } }, [...asyncRouterMap]) }, - isPrivileged(route) { - if (route.roles && route.roles.some(role => this.$store.getters.roles.indexOf(role) >= 0)) { - return true - } - - if (route.privileges && route.privileges.some(privilege => this.$store.getters.privileges.indexOf(privilege) >= 0)) { - return true - } - - return false - }, async handleOpen($event) { if ($event === '/settings') { let settingsTabs = localStorage.getItem('settingsTabs')