From 06cf1ffdf84f7ff034387394927865960fa4291f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kruli=C5=A1?= Date: Thu, 16 Jan 2025 18:57:15 +0100 Subject: [PATCH] Fixing ACLs policies for exams (students can submit anything in a group before the beginning of an exam). --- .../security/Policies/AssignmentPermissionPolicy.php | 5 +++-- app/V1Module/security/Policies/GroupPermissionPolicy.php | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/V1Module/security/Policies/AssignmentPermissionPolicy.php b/app/V1Module/security/Policies/AssignmentPermissionPolicy.php index bb5603eb4..266b5c101 100644 --- a/app/V1Module/security/Policies/AssignmentPermissionPolicy.php +++ b/app/V1Module/security/Policies/AssignmentPermissionPolicy.php @@ -123,13 +123,14 @@ public function userIsNotLockedElsewhereStrictly(Identity $identity, Assignment } /** - * The assignment is not in an exam group, or it is already after the exam. + * The assignment is not in an exam group, or it is still before/already after the exam. */ public function isExamNotInProgress(Identity $identity, Assignment $assignment): bool { $group = $assignment->getGroup(); $now = new DateTime(); - return $group && (!$group->hasExamPeriodSet($now) || $group->getExamEnd() < $now); + return $group && (!$group->hasExamPeriodSet($now) || + $now < $group->getExamBegin() || $group->getExamEnd() < $now); } /** diff --git a/app/V1Module/security/Policies/GroupPermissionPolicy.php b/app/V1Module/security/Policies/GroupPermissionPolicy.php index 768d18dc6..9b12188f8 100644 --- a/app/V1Module/security/Policies/GroupPermissionPolicy.php +++ b/app/V1Module/security/Policies/GroupPermissionPolicy.php @@ -4,7 +4,6 @@ use App\Model\Entity\Group; use App\Model\Entity\Instance; -use App\Model\Repository\Groups; use App\Security\Identity; use DateTIme;