gem:26673 fix also user with role LessonTeacher use portal

bkd-mba-fbi · Oct 20, 2023 · 817e5be · 817e5be
1 parent 428311b
commit 817e5be
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/cypress/e2e/navigationMenu.cy.ts b/cypress/e2e/navigationMenu.cy.ts
@@ -159,9 +159,12 @@ describe("Navigation Menu", () => {
     });
   });
 
-  describe("with 'TeacherRole' role", () => {
+  describe("with 'TeacherRole' and 'LessonTeacherRole' role", () => {
     beforeEach(() => {
-      cy.login({ roles: ["TeacherRole"], permissions: [] });
+      cy.login({
+        roles: ["TeacherRole", "LessonTeacherRole"],
+        permissions: [],
+      });
       cy.resizeToMobile();
       cy.visit("/index.html");
     });

diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "lint:ts": "tsc --noEmit",
     "lint": "npm run lint:eslint && npm run lint:ts",
     "cy:run": "cypress run --browser chromium",
+    "cy:firefox": "cypress run --browser firefox",
     "cy:open": "cypress open",
     "locale:extract": "lit-localize extract",
     "locale:build": "lit-localize build",

diff --git a/src/settings.ts b/src/settings.ts
@@ -202,6 +202,7 @@ export const settings: Settings = {
             label: msg("Präsenzkontrolle"),
             allowedRolesOrPermissions: [
               "TeacherRole",
+              "LessonTeacherRole",
               "AbsenceAdministratorRole",
             ],
             deniedInstanceIds: null,
@@ -213,6 +214,7 @@ export const settings: Settings = {
             label: msg("Aktuelle Fächer"),
             allowedRolesOrPermissions: [
               "TeacherRole",
+              "LessonTeacherRole",
               "ClassTeacherRole",
               "AbsenceAdministratorRole",
             ],
@@ -225,6 +227,7 @@ export const settings: Settings = {
             label: msg("Tests und Bewertung"),
             allowedRolesOrPermissions: [
               "TeacherRole",
+              "LessonTeacherRole",
               "AbsenceAdministratorRole",
             ],
             deniedInstanceIds: null,
@@ -234,15 +237,15 @@ export const settings: Settings = {
           {
             key: "substitutionsAssign",
             label: msg("Stellvertretung erfassen"),
-            allowedRolesOrPermissions: ["TeacherRole"],
+            allowedRolesOrPermissions: ["TeacherRole", "LessonTeacherRole"],
             deniedInstanceIds: null,
             appKey: "stellvertretung",
             appPath: "#/substitutions/assign",
           },
           {
             key: "substitutionsExecute",
             label: msg("Stellvertretung ausüben"),
-            allowedRolesOrPermissions: ["TeacherRole"],
+            allowedRolesOrPermissions: ["TeacherRole", "LessonTeacherRole"],
             deniedInstanceIds: null,
             appKey: "stellvertretung",
             appPath: "#/substitutions/execute",
@@ -257,6 +260,7 @@ export const settings: Settings = {
             label: msg("Offene Absenzen entschuldigen"),
             allowedRolesOrPermissions: [
               "TeacherRole",
+              "LessonTeacherRole",
               "ClassTeacherRole",
               "AbsenceAdministratorRole",
             ],
@@ -269,6 +273,7 @@ export const settings: Settings = {
             label: msg("Absenzen bearbeiten"),
             allowedRolesOrPermissions: [
               "TeacherRole",
+              "LessonTeacherRole",
               "ClassTeacherRole",
               "AbsenceAdministratorRole",
             ],
@@ -281,6 +286,7 @@ export const settings: Settings = {
             label: msg("Absenzen auswerten"),
             allowedRolesOrPermissions: [
               "TeacherRole",
+              "LessonTeacherRole",
               "ClassTeacherRole",
               "AbsenceAdministratorRole",
             ],
@@ -327,6 +333,7 @@ export const settings: Settings = {
             label: msg("Schulinterne Weiterbildung"),
             allowedRolesOrPermissions: [
               "TeacherRole",
+              "LessonTeacherRole",
               "ClassTeacherRole",
               "AbsenceAdministratorRole",
               "SubstituteAdministratorRole",