diff --git a/src/layouts/legacyLoggedIn.vue b/src/layouts/legacyLoggedIn.vue index 6bf0456f33..bfe0cb34ca 100644 --- a/src/layouts/legacyLoggedIn.vue +++ b/src/layouts/legacyLoggedIn.vue @@ -85,7 +85,9 @@ export default defineComponent({ }); const sidebarItems = computed(() => { - let sidebarItems = getSidebarItems(); + let sidebarItems = getSidebarItems( + envConfigModule.getNewSchoolAdminPageAsDefault + ); const isSidebarCategoryItem = ( item: SidebarItem | SidebarCategoryItem diff --git a/src/pages/administration/LDAPActivate.page.vue b/src/pages/administration/LDAPActivate.page.vue index c755cb6b4d..39a648ec40 100644 --- a/src/pages/administration/LDAPActivate.page.vue +++ b/src/pages/administration/LDAPActivate.page.vue @@ -259,7 +259,9 @@ export default { }, { text: this.$t("pages.administration.school.index.title"), - href: "/administration/school-settings", + href: envConfigModule.getNewSchoolAdminPageAsDefault + ? "/administration/school-settings" + : "/administration/school", }, { text: this.$t("pages.administration.ldap.index.title"), @@ -317,7 +319,7 @@ export default { }, okButtonHandler() { this.$router.push({ - path: `/administration/school-settings`, + path: `/administration/school`, }); }, }, diff --git a/src/pages/administration/LDAPConfig.page.vue b/src/pages/administration/LDAPConfig.page.vue index fb12cd81a5..fabeff57de 100644 --- a/src/pages/administration/LDAPConfig.page.vue +++ b/src/pages/administration/LDAPConfig.page.vue @@ -95,7 +95,7 @@ import ConnectionSection from "@/components/organisms/Ldap/LdapConnectionSection import UsersSection from "@/components/organisms/Ldap/LdapUsersSection.vue"; import ClassesSection from "@/components/organisms/Ldap/LdapClassesSection.vue"; import InfoMessage from "@/components/atoms/InfoMessage"; -import { notifierModule } from "@/store"; +import { notifierModule, envConfigModule } from "@/store"; import { buildPageTitle } from "@/utils/pageTitle"; export default { @@ -116,7 +116,9 @@ export default { }, { text: this.$t("pages.administration.school.index.title"), - href: "/administration/school-settings", + href: envConfigModule.getNewSchoolAdminPageAsDefault + ? "/administration/school-settings" + : "/administration/school", }, { text: this.$t("pages.administration.ldap.index.title"), diff --git a/src/pages/administration/SchoolSettings.page.vue b/src/pages/administration/SchoolSettings.page.vue index e00c8fae09..49772f3298 100644 --- a/src/pages/administration/SchoolSettings.page.vue +++ b/src/pages/administration/SchoolSettings.page.vue @@ -10,6 +10,14 @@