Merge pull request #5828 from Laravel-Backpack/fix-crud-fields-script-issue

fix crud field javacript issue

Author: pxpm

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

@@ -41,16 +41,16 @@
 				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' ])
-		      @else
-		      	@include('crud::form_content', [ 'fields' => $crud->fields(), 'action' => 'create' ])
-		      @endif
-                {{-- This makes sure that all field assets are loaded. --}}
-                <div class="d-none" id="parentLoadedAssets">{{ json_encode(Basset::loaded()) }}</div>
-	          @include('crud::inc.form_save_buttons')
+                {!! 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' ])
+                @else
+                    @include('crud::form_content', [ 'fields' => $crud->fields(), 'action' => 'create' ])
+                @endif
+                    {{-- This makes sure that all field assets are loaded. --}}
+                    <div class="d-none" id="parentLoadedAssets">{{ json_encode(Basset::loaded()) }}</div>
+                @include('crud::inc.form_save_buttons')
 		  </form>
 	</div>
 </div>

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

@@ -22,6 +22,10 @@
 
 @endpush
 
+@push('before_scripts')
+  @include('crud::inc.form_fields_script')
+@endpush
+
 @push('after_scripts')
 
     {{-- CRUD FORM CONTENT - crud_fields_scripts stack --}}
@@ -287,6 +291,4 @@ function preventUnload(event) {
       }
       });
     </script>
-
-    @include('crud::inc.form_fields_script')
 @endpush

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

@@ -187,7 +187,7 @@ class CrudField {
     window.crud = {
         ...window.crud,
 
-        action: "{{ $action ?? "" }}",
+        action: "{{ $action ?? '' }}",
 
         // Subfields callbacks holder
         subfieldsCallbacks: [],