Fixed so moderators can publish reports of trainings without being as…

…signed #282
Vatsim-Scandinavia · Mar 6, 2021 · b94e0fa · b94e0fa
1 parent 67163f2
commit b94e0fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/app/Policies/TrainingExaminationPolicy.php b/app/Policies/TrainingExaminationPolicy.php
@@ -31,13 +31,8 @@ public function view(User $user, TrainingExamination $examination)
      */
     public function create(User $user)
     {
-        if (($key = session()->get('onetimekey')) != null) {
-            $link = OneTimeLink::where('key', $key)->get()->first();
-
-            return $link != null && $user->isMentorOrAbove($link->training->area);
-        }
-
-        return $user->isMentorOrAbove();
+        // We use TrainingPolicy-createExamination instead, so this should always return false.
+        return false;
     }
 
     /**

diff --git a/app/Policies/TrainingPolicy.php b/app/Policies/TrainingPolicy.php
@@ -122,11 +122,11 @@ public function viewReports(User $user, Training $training)
     public function createReport(User $user, Training $training)
     {
         if (($link = $this->getOneTimeLink($training)) != null) {
-            return $user->isMentor($link->training->area);
+            return $user->isModerator($link->training->area) || $user->isMentor($link->training->area);
         }
 
         // Check if mentor is mentoring area, not filling their own training and the training is in progress
-        return $training->mentors->contains($user) && $user->isNot($training->user);
+        return $user->isModerator($training->area) || ($training->mentors->contains($user) && $user->isNot($training->user));
     }
 
     public function createExamination(User $user, Training $training)

diff --git a/app/Policies/TrainingReportPolicy.php b/app/Policies/TrainingReportPolicy.php
@@ -36,13 +36,8 @@ public function view(User $user, TrainingReport $trainingReport)
      */
     public function create(User $user)
     {
-        if (($key = session()->get('onetimekey')) != null) {
-            $link = OneTimeLink::where('key', $key)->get()->first();
-
-            return $link != null && $user->isMentor($link->training->area);
-        }
-
-        return $user->isMentor();
+        // We use TrainingPolicy-createReport instead, so this should always return false.
+        return false;
     }
 
     /**