diff --git a/aleksis/core/assets/App.vue b/aleksis/core/assets/App.vue index 8e525db874be43819793c96d7d16654712e329cc..8882765d09e6959fc181073fe90371abdbc83ee4 100644 --- a/aleksis/core/assets/App.vue +++ b/aleksis/core/assets/App.vue @@ -454,12 +454,12 @@ export default { this.accountMenu = this.buildMenu( this.$router.getRoutes(), "inAccountMenu", - this.whoAmI.permissions + this.whoAmI ? this.whoAmI.permissions : [] ); this.sideNavMenu = this.buildMenu( this.$router.getRoutes(), "inMenu", - this.whoAmI.permissions + this.whoAmI ? this.whoAmI.permissions : [] ); }, }, @@ -517,6 +517,7 @@ export default { }, mounted() { this.$router.onReady(this.getPermissionNames); + this.buildMenus(); }, name: "App", components: { diff --git a/aleksis/core/assets/routeValidators.js b/aleksis/core/assets/routeValidators.js index 5226209a5419f87f79308e174bf329c3a32ca642..5db52731038d43e9e941483dab8906de9a88763d 100644 --- a/aleksis/core/assets/routeValidators.js +++ b/aleksis/core/assets/routeValidators.js @@ -1,5 +1,5 @@ const notLoggedInValidator = (whoAmI) => { - return !whoAmI; + return !whoAmI || whoAmI.isAnonymous; }; export { notLoggedInValidator }; diff --git a/aleksis/core/assets/routes.js b/aleksis/core/assets/routes.js index a69cb07c4ebb1b83c99f045cc43b7deeeb850fd9..3c5b874ee731a6bc7dc55b915ac3ac9bacc3cb32 100644 --- a/aleksis/core/assets/routes.js +++ b/aleksis/core/assets/routes.js @@ -15,7 +15,6 @@ const routes = [ inMenu: true, icon: "mdi-login-variant", titleKey: "accounts.login.menu_title", - permission: "core.login_rule", validators: [notLoggedInValidator], }, }, @@ -27,7 +26,6 @@ const routes = [ inMenu: true, icon: "mdi-account-plus-outline", titleKey: "accounts.signup.menu_title", - permission: "core.signup_rule", validators: [notLoggedInValidator], }, }, @@ -39,7 +37,6 @@ const routes = [ inMenu: true, icon: "mdi-key-outline", titleKey: "accounts.invitation.accept_invitation.menu_title", - permission: "core.accept_invite_rule", validators: [notLoggedInValidator], }, },