Skip to content
Snippets Groups Projects
Verified Commit 23d4011b authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix menu generation for logged-out users

parent ed1b29cc
No related branches found
No related tags found
1 merge request!1123Resolve "Finalise Vuetify app as SPA"
...@@ -454,12 +454,12 @@ export default { ...@@ -454,12 +454,12 @@ export default {
this.accountMenu = this.buildMenu( this.accountMenu = this.buildMenu(
this.$router.getRoutes(), this.$router.getRoutes(),
"inAccountMenu", "inAccountMenu",
this.whoAmI.permissions this.whoAmI ? this.whoAmI.permissions : []
); );
this.sideNavMenu = this.buildMenu( this.sideNavMenu = this.buildMenu(
this.$router.getRoutes(), this.$router.getRoutes(),
"inMenu", "inMenu",
this.whoAmI.permissions this.whoAmI ? this.whoAmI.permissions : []
); );
}, },
}, },
...@@ -517,6 +517,7 @@ export default { ...@@ -517,6 +517,7 @@ export default {
}, },
mounted() { mounted() {
this.$router.onReady(this.getPermissionNames); this.$router.onReady(this.getPermissionNames);
this.buildMenus();
}, },
name: "App", name: "App",
components: { components: {
......
const notLoggedInValidator = (whoAmI) => { const notLoggedInValidator = (whoAmI) => {
return !whoAmI; return !whoAmI || whoAmI.isAnonymous;
}; };
export { notLoggedInValidator }; export { notLoggedInValidator };
...@@ -15,7 +15,6 @@ const routes = [ ...@@ -15,7 +15,6 @@ const routes = [
inMenu: true, inMenu: true,
icon: "mdi-login-variant", icon: "mdi-login-variant",
titleKey: "accounts.login.menu_title", titleKey: "accounts.login.menu_title",
permission: "core.login_rule",
validators: [notLoggedInValidator], validators: [notLoggedInValidator],
}, },
}, },
...@@ -27,7 +26,6 @@ const routes = [ ...@@ -27,7 +26,6 @@ const routes = [
inMenu: true, inMenu: true,
icon: "mdi-account-plus-outline", icon: "mdi-account-plus-outline",
titleKey: "accounts.signup.menu_title", titleKey: "accounts.signup.menu_title",
permission: "core.signup_rule",
validators: [notLoggedInValidator], validators: [notLoggedInValidator],
}, },
}, },
...@@ -39,7 +37,6 @@ const routes = [ ...@@ -39,7 +37,6 @@ const routes = [
inMenu: true, inMenu: true,
icon: "mdi-key-outline", icon: "mdi-key-outline",
titleKey: "accounts.invitation.accept_invitation.menu_title", titleKey: "accounts.invitation.accept_invitation.menu_title",
permission: "core.accept_invite_rule",
validators: [notLoggedInValidator], validators: [notLoggedInValidator],
}, },
}, },
......
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