Merge branch '4.2' into do-not-use-subfields-attribute-only-for-check…

…list-dependency-field
Laravel-Backpack · Jan 14, 2022 · e53ca79 · e53ca79
2 parents ae9513f + 34785a0
commit e53ca79
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/resources/views/crud/fields/inc/repeatable_row.blade.php b/src/resources/views/crud/fields/inc/repeatable_row.blade.php
@@ -18,11 +18,12 @@
     </div>
     @foreach($field['subfields'] as $subfield)
         @php
-            // make sure the field is an array
+            // make sure the field definition is an array
             if (is_string($subfield)) {
                 $subfield = ['name' => $subfield];
             }
-            // avoid relationship field type
+            // all subfields are considered text fields if not otherwise specified
+            $subfield['type'] = $subfield['type'] ?? 'text';
             $subfield['entity'] = $subfield['entity'] ?? false;
             $subfield = $crud->makeSureFieldHasNecessaryAttributes($subfield);
             $fieldViewNamespace = $subfield['view_namespace'] ?? 'crud::fields';

diff --git a/src/resources/views/crud/fields/relationship/entries.blade.php b/src/resources/views/crud/fields/relationship/entries.blade.php
@@ -12,20 +12,20 @@
     $field['init_rows'] = 0;
     $field['subfields'] = $field['subfields'] ?? [];
     $field['reorder'] = $field['reorder'] ?? false;
-    $inline_create = !isset($inlineCreate) && isset($pivotSelectorField['inline_create']) ? $pivotSelectorField['inline_create'] : false;
+    
     $pivotSelectorField = $field['pivotSelect'] ?? [];
+    $inline_create = !isset($inlineCreate) && isset($pivotSelectorField['inline_create']) ? $pivotSelectorField['inline_create'] : false;
     $pivotSelectorField['name'] = $field['name'];
+    $pivotSelectorField['type'] = 'relationship';
     $pivotSelectorField['is_pivot_select'] = true;
     $pivotSelectorField['multiple'] = false;
-    $pivotSelectorField['ajax'] = $pivotSelectorField['ajax'] ?? false;
-    $pivotSelectorField['data_source'] = $pivotSelectorField['data_source'] ?? isset($pivotSelectorField['ajax']) && $pivotSelectorField['ajax'] ? url($crud->route.'/fetch/'.$field['entity']) : 'false';
+    $pivotSelectorField['entity'] = $field['name'];    
+    $pivotSelectorField['ajax'] = $inline_create !== false ? true : ($pivotSelectorField['ajax'] ?? false);
+    $pivotSelectorField['data_source'] = $pivotSelectorField['data_source'] ?? ($pivotSelectorField['ajax'] ? url($crud->route.'/fetch/'.$field['entity']) : 'false');
     $pivotSelectorField['minimum_input_length'] = $pivotSelectorField['minimum_input_length'] ?? 2;
     $pivotSelectorField['delay'] = $pivotSelectorField['delay'] ?? 500;
     $pivotSelectorField['placeholder'] = $pivotSelectorField['placeholder'] ?? trans('backpack::crud.select_entry');
-
-    if($inline_create) {
-        $field['inline_create'] = $inline_create;
-    }
+    
     switch ($field['relation_type']) {
         case 'MorphToMany':
         case 'BelongsToMany':
@@ -43,4 +43,4 @@
     }
 @endphp
 
-@include('crud::fields.repeatable')
+@include('crud::fields.repeatable')