Merge pull request #206 from dbarzin/dev

Dev
dbarzin · Oct 30, 2024 · ffa0b9d · ffa0b9d
2 parents a2eaba4 + c8acc31
commit ffa0b9d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -226,10 +226,6 @@ Migrate database
 
     php artisan migrate
 
-Update composer
-
-    composer self-update
-
 Update libraries
 
     composer update

diff --git a/app/Http/Controllers/MeasureController.php b/app/Http/Controllers/MeasureController.php
@@ -177,13 +177,14 @@ public function show(int $id)
             '403 Forbidden'
         );
 
-        // user must have and assigned controls
+        // user must have one control assigned
         abort_if(
             (Auth::User()->role === 5) &&
             ! DB::table('controls')
                 ->where('measure_id', $id)
-                ->leftjoin('control_user', 'control_id', '=', 'controls.id')
-                ->where('user_id', Auth::User()->id)
+                ->join('control_measure', 'control_measure.control_id', '=', 'controls.id')
+                ->join('control_user', 'control_user.control_id', '=', 'controls.id')
+                ->where('control_user.user_id', Auth::User()->id)
                 ->exists(),
             Response::HTTP_FORBIDDEN,
             '403 Forbidden'

diff --git a/storage/app/repository/ISO27001-2022.en.xlsx b/storage/app/repository/ISO27001-2022.en.xlsx