Merge branch 'develop' into milestone/ff-admin-unit
# Conflicts: # package-lock.json # package.json # src/views/admin/club/newsletter/NewsletterRecipients.vue
This commit is contained in:
commit
b7f22357ec
53 changed files with 1757 additions and 950 deletions
|
@ -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",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue