Merge pull request #5840 from Laravel-Backpack/fix-error-highlight

fix form error highlight

Author: pxpm

src/resources/views/crud/components/dataform/form.blade.php

@@ -10,7 +10,6 @@
     >
         {!! csrf_field() !!}
 
-        <input type="hidden" name="_form_id" value="{{ $id }}">
         @if($method !== 'post')
             @method($method)
         @endif

src/resources/views/crud/create.blade.php

@@ -28,25 +28,25 @@
 @endsection
 
 @section('content')
-
 <div class="row" bp-section="crud-operation-create">
 	<div class="{{ $crud->getCreateContentClass() }}">
 		{{-- Default box --}}
 
-		@include('crud::inc.grouped_errors', ['id' => $id ?? null])
+		@include('crud::inc.grouped_errors', ['id' => $id ?? 'crudForm'])
 
 		  <form method="post"
 		  		action="{{ url($crud->route) }}"
+                id="{{ $id ?? 'crudForm' }}"
 				@if ($crud->hasUploadFields('create'))
 				enctype="multipart/form-data"
 				@endif
 		  		>
                 {!! csrf_field() !!}
                 {{-- load the view from the application if it exists, otherwise load the one in the package --}}
                 @if(view()->exists('vendor.backpack.crud.form_content'))
-                    @include('vendor.backpack.crud.form_content', [ 'fields' => $crud->fields(), 'action' => 'create', 'id' => $id ?? null])
+                    @include('vendor.backpack.crud.form_content', [ 'fields' => $crud->fields(), 'action' => 'create', 'id' => $id ?? 'crudForm'])
                 @else
-                    @include('crud::form_content', [ 'fields' => $crud->fields(), 'action' => 'create', 'id' => $id ?? null])
+                    @include('crud::form_content', [ 'fields' => $crud->fields(), 'action' => 'create', 'id' => $id ?? 'crudForm'])
                 @endif
                     {{-- This makes sure that all field assets are loaded. --}}
                     <div class="d-none" id="parentLoadedAssets">{{ json_encode(Basset::loaded()) }}</div>

src/resources/views/crud/edit.blade.php

@@ -28,10 +28,13 @@
 	<div class="{{ $crud->getEditContentClass() }}">
 		{{-- Default box --}}
 
-		@include('crud::inc.grouped_errors', ['id' => $id])
+		@include('crud::inc.grouped_errors', ['id' => $id ?? 'crudForm'])
+
+		  {{-- This makes sure that all field assets are loaded. --}}
 
 		  <form method="post"
 		  		action="{{ url($crud->route.'/'.$entry->getKey()) }}"
+				id="{{ $id ?? 'crudForm' }}"
 				@if ($crud->hasUploadFields('update', $entry->getKey()))
 				enctype="multipart/form-data"
 				@endif
@@ -43,9 +46,9 @@
 
 			{{-- load the view from the application if it exists, otherwise load the one in the package --}}
 			@if(view()->exists('vendor.backpack.crud.form_content'))
-				@include('vendor.backpack.crud.form_content', ['fields' => $crud->fields(), 'action' => 'edit', 'id' => $id ?? null])
+				@include('vendor.backpack.crud.form_content', ['fields' => $crud->fields(), 'action' => 'edit', 'id' => $id ?? 'crudForm'])
 			@else
-				@include('crud::form_content', ['fields' => $crud->fields(), 'action' => 'edit', 'id' => $id ?? null])
+				@include('crud::form_content', ['fields' => $crud->fields(), 'action' => 'edit', 'id' => $id ?? 'crudForm'])
 			@endif
 			{{-- This makes sure that all field assets are loaded. --}}
 			<div class="d-none" id="parentLoadedAssets">{{ json_encode(Basset::loaded()) }}</div>

src/resources/views/crud/form_content.blade.php

@@ -1,4 +1,5 @@
 <input type="hidden" name="_http_referrer" value={{ session('referrer_url_override') ?? old('_http_referrer') ?? \URL::previous() ?? url($crud->route) }}>
+<input type="hidden" name="_form_id" value="{{ $id ?? 'crudForm' }}">
 
 {{-- See if we're using tabs --}}
 @if ($crud->tabsEnabled() && count($crud->getTabs()))

src/resources/views/crud/inc/grouped_errors.blade.php

@@ -1,12 +1,12 @@
 {{-- Show the errors, if any --}}
 @if ($crud->groupedErrorsEnabled() && session()->get('errors'))
     @php
-        $submittedFormId = old('_form_id') ?? null;
-        $currentFormId = $id ?? null;
+        $submittedFormId = old('_form_id') ?? 'crudForm';
+        $currentFormId = $id ?? 'crudForm';
     @endphp
     @if (!$submittedFormId || $submittedFormId === $currentFormId)
-    <div class="alert alert-danger">
-        <ul class="list-unstyled">
+    <div class="alert alert-danger text-danger">
+        <ul class="list-unstyled mb-0">
             @foreach(session()->get('errors')->getBags() as $bag => $errorMessages)
                 @foreach($errorMessages->getMessages() as $errorMessageForInput)
                     @foreach($errorMessageForInput as $message)