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

Merge branch 'develop' into milestone/ff-admin-unit

Browse source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/views/admin/club/newsletter/NewsletterRecipients.vue
This commit is contained in:
Julian Krauser 2025-06-08 08:02:16 +02:00
commit b7f22357ec
53 changed files with 1757 additions and 950 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/router/club/memberGuard.ts
View file

@ -4,6 +4,7 @@ import { useMemberAwardStore } from "@/stores/admin/club/member/memberAward";
import { useMemberExecutivePositionStore } from "@/stores/admin/club/member/memberExecutivePosition";
import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
import { useMembershipStore } from "@/stores/admin/club/member/membership";
import { useMemberEducationStore } from "@/stores/admin/club/member/memberEducation";
export async function setMemberId(to: any, from: any, next: any) {
const member = useMemberStore();
@ -14,6 +15,7 @@ export async function setMemberId(to: any, from: any, next: any) {
useMemberAwardStore().$reset();
useMemberExecutivePositionStore().$reset();
useMemberQualificationStore().$reset();
useMemberEducationStore().$reset();
next();
}
@ -28,6 +30,7 @@ export async function resetMemberStores(to: any, from: any, next: any) {
useMemberAwardStore().$reset();
useMemberExecutivePositionStore().$reset();
useMemberQualificationStore().$reset();
useMemberEducationStore().$reset();
next();
}

30
src/router/index.ts
View file

@ -152,6 +152,12 @@ const router = createRouter({
component: () => import("@/views/admin/club/members/MemberAwards.vue"),
props: true,
},
{
path: "educations",
name: "admin-club-member-educations",
component: () => import("@/views/admin/club/members/MemberEducations.vue"),
props: true,
},
{
path: "qualifications",
name: "admin-club-member-qualifications",
@ -942,6 +948,30 @@ const router = createRouter({
},
],
},
{
path: "education",
name: "admin-configuration-education-route",
component: () => import("@/views/RouterView.vue"),
meta: { type: "read", section: "configuration", module: "education" },
beforeEnter: [abilityAndNavUpdate],
children: [
{
path: "",
name: "admin-configuration-education",
component: () => import("@/views/admin/configuration/education/Education.vue"),
meta: { type: "read", section: "configuration", module: "education" },
beforeEnter: [abilityAndNavUpdate],
},
{
path: ":id/edit",
name: "admin-configuration-education-edit",
component: () => import("@/views/admin/configuration/education/EducationEdit.vue"),
meta: { type: "update", section: "configuration", module: "education" },
beforeEnter: [abilityAndNavUpdate],
props: true,
},
],
},
{
path: "executive-position",
name: "admin-configuration-executive_position-route",