improve error handling

dbarzin · Nov 1, 2023 · 212028c · 212028c
1 parent ee64335
commit 212028c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/app/Http/Controllers/ControlController.php b/app/Http/Controllers/ControlController.php
@@ -565,7 +565,7 @@ public function plan(int $id)
         if ($control === null) {
             return;
         }
-
+xxxxx
         $years = [];
         $cur_year = Carbon::now()->year;
         for ($i = 0; $i <= 3; $i++) {
@@ -645,9 +645,7 @@ public function doPlan(Request $request)
         $control = Control::find($request->id);
 
         // Control not found
-        if ($control === null) {
-            abort(404);
-        }
+        abort_if($control === null, Response::HTTP_NOT_FOUND, '404 Not Found');
 
         // Control already made ?
         if ($control->realisation_date !== null) {
@@ -683,11 +681,10 @@ public function make(Request $request)
 
         $id = (int) request('id');
 
-        // Control not found
         $control = Control::find($id);
-        if ($control === null) {
-            abort(404);
-        }
+
+        // Control not found
+        abort_if($control === null, Response::HTTP_NOT_FOUND, '404 Not Found');
 
         // Control already made ?
         if ($control->realisation_date !== null) {
@@ -732,9 +729,7 @@ public function doMake()
         $control = Control::find($id);
 
         // Control not found
-        if ($control === null) {
-            abort(404);
-        }
+        abort_if($control === null, Response::HTTP_NOT_FOUND, '404 Not Found');
 
         // control already made ?
         if ($control->realisation_date !== null) {
@@ -790,9 +785,7 @@ public function save(Request $request)
         $control = Control::find($request->id);
 
         // Control not found
-        if ($control === null) {
-            abort(404);
-        }
+        abort_if($control === null, Response::HTTP_NOT_FOUND, '404 Not Found');
 
         $control->name = request('name');
         $control->scope = request('scope');

diff --git a/resources/views/measures/show.blade.php b/resources/views/measures/show.blade.php
@@ -108,7 +108,6 @@
 		    </form>
 		    &nbsp;
 			<form action="/alice/delete/{{ $measure->id }}" method="POST" onSubmit="if(!confirm('{{ trans('common.confirm') }}')){return false;}">
-				@csrf
 				<button class="button alert" type="submit">
 					<span class="mif-fire"></span>
 					&nbsp;
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,7 +108,6 @@ @@
     		    </form>
     		    &nbsp;
     			<form action="/alice/delete/{{ $measure->id }}" method="POST" onSubmit="if(!confirm('{{ trans('common.confirm') }}')){return false;}">
-    				@csrf
     				<button class="button alert" type="submit">
     					<span class="mif-fire"></span>
     					&nbsp;
@@ Expand Down @@