Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 17 Pull requests Projects Releases 12 Packages Wiki Activity Actions

patches v1.3.2 #71

Merged
jkeffects merged 15 commits from develop into main 2025-03-12 08:52:40 +00:00
Conversation 0 Commits 15 Files changed 157 +6 -4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8033038c2e - Show all commits

8
src/router/adminGuard.ts
View file

@ -7,15 +7,15 @@ export async function abilityAndNavUpdate(to: any, from: any, next: any) {
const ability = useAbilityStore(); const ability = useAbilityStore();
const navigation = useNavigationStore(); const navigation = useNavigationStore();
let admin = to.meta.admin || false;
let type = to.meta.type; let type = to.meta.type;
let section = to.meta.section; let section = to.meta.section;
let module = to.meta.module; let module = to.meta.module;
navigation.activeNavigation = to.name.split("-")[1]; if ((admin && ability.isAdmin()) || ability.can(type, section, module)) {
navigation.activeLink = to.name.split("-")[2];
if (ability.can(type, section, module)) {
NProgress.done(); NProgress.done();
navigation.activeNavigation = to.name.split("-")[1];
navigation.activeLink = to.name.split("-")[2];
next(); next();
} else { } else {
NProgress.done(); NProgress.done();

2
src/router/index.ts
View file

@ -665,6 +665,8 @@ const router = createRouter({
path: "version", path: "version",
name: "admin-user-version", name: "admin-user-version",
component: () => import("@/views/admin/management/version/VersionDisplay.vue"), component: () => import("@/views/admin/management/version/VersionDisplay.vue"),
meta: { admin: true },
beforeEnter: [abilityAndNavUpdate],
}, },
], ],
}, },