Merge pull request #140 from dbarzin/dev

Dev
dbarzin · Sep 25, 2024 · a9183ab · a9183ab
2 parents 1644668 + edc03e7
commit a9183ab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/app/Http/Controllers/DomainController.php b/app/Http/Controllers/DomainController.php
@@ -149,13 +149,13 @@ public function destroy(Domain $domain)
         abort_if(Auth::User()->role !== 1, Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         // Has measures ?
-        abort_if(
-            DB::table('measures')
-                ->where('domain_id', $domain->id)
-                ->exists(),
-            Response::HTTP_FORBIDDEN,
-            '403 Forbidden'
-        );
+        if (DB::table('measures')
+            ->where('domain_id', $domain->id)
+            ->exists()) {
+            return back()
+                ->withErrors(['msg' => 'There are controls associated with this framework !'])
+                ->withInput();
+        }
 
         $domain->delete();
 

diff --git a/resources/views/domains/show.blade.php b/resources/views/domains/show.blade.php
@@ -3,6 +3,17 @@
 @section("content")
 <div class="p-3">
     <div data-role="panel" data-title-caption="{{ trans('cruds.domain.show') }}" data-collapsible="true" data-title-icon="<span class='mif-chart-line'></span>">
+		@if (count($errors))
+		<div class="grid">
+		    <div class="cell-5 bg-red fg-white">
+				<ul>
+				@foreach ($errors->all() as $error)
+					<li>{{ $error }}</li>
+				@endforeach
+				</ul>
+			</div>
+		</div>
+		@endif
 		<div class="grid">
 	    	<div class="row">
 	    		<div class="cell-1">