diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49e08b76cad101bbf9057176006e6bb08e3c7413..505d3f55ed66aa2769e5b54f0b196aaa80159c9e 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -100,7 +100,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 fde0369e1876e3e68a9b546d6363adfab6a58af4..ed8bd849640e0898a12d0e2ab2b682a128a87ab7 100644 --- a/src/views/layout/components/Sidebar/index.vue +++ b/src/views/layout/components/Sidebar/index.vue @@ -9,7 +9,7 @@ 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> @@ -53,17 +53,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')