Skip to content
Snippets Groups Projects
Commit 3288ae14 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Fix permission checking when displaying menus and router-view

parent cfb1941b
No related branches found
No related tags found
2 merge requests!1123Resolve "Finalise Vuetify app as SPA",!1066Translations update from Weblate
Pipeline #105505 failed
<template>
<v-app v-cloak>
<loading
v-if="
$apollo.loading &&
(!currentUser ||
!whoAmI ||
!systemProperties)
"
v-if="$apollo.loading && (!currentUser || !whoAmI || !systemProperties)"
>
</loading>
<div v-else>
......@@ -164,17 +159,22 @@
<router-view
v-if="
permissionResults &&
($route.meta.permission
? permissionResults.find(
(p) => p.name === $route.meta.permission
).result
: true)
!$route.meta.permission ||
(permissionResults &&
permissionResults.find(
(p) => p.name === $route.meta.permission
) &&
permissionResults.find((p) => p.name === $route.meta.permission)
.result)
"
/>
<message-box
type="error"
v-else-if="
permissionResults &&
permissionResults.find(
(p) => p.name === $route.meta.permission
) &&
permissionResults.find((p) => p.name === $route.meta.permission)
.result === false
"
......@@ -197,7 +197,11 @@
<v-card flat tile class="primary white--text flex-grow-1">
<v-card-text class="pa-0">
<v-container class="px-6">
<v-row justify="center" v-if="footerMenu && footerMenu.items" no-gutters>
<v-row
justify="center"
v-if="footerMenu && footerMenu.items"
no-gutters
>
<v-btn
v-for="menu_item in footerMenu.items"
:key="menu_item.name"
......@@ -214,10 +218,7 @@
</v-btn>
</v-row>
<v-row justify="center" v-else-if="!footerMenu">
<v-skeleton-loader
class="ma-2"
type="chip"
/>
<v-skeleton-loader class="ma-2" type="chip" />
</v-row>
</v-container>
</v-card-text>
......@@ -323,7 +324,8 @@ export default {
route.meta[menuKey] &&
!route.parent &&
(route.meta.permission
? permissionResults.find((p) => p.name === route.meta.permission)
? permissionResults.find((p) => p.name === route.meta.permission) &&
permissionResults.find((p) => p.name === route.meta.permission)
.result
: true)
) {
......@@ -347,7 +349,8 @@ export default {
route.parent.name &&
route.parent.name in menu &&
(route.meta.permission
? permissionResults.find((p) => p.name === route.meta.permission)
? permissionResults.find((p) => p.name === route.meta.permission) &&
permissionResults.find((p) => p.name === route.meta.permission)
.result
: true)
) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment