extract partials

maxkhalmurzaev · Nov 6, 2017 · fdea8bc · fdea8bc
1 parent 436525a
commit fdea8bc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 34 deletions.
diff --git a/src/views/default/_form_body/component_details.blade.php b/src/views/default/_form_body/component_details.blade.php
@@ -0,0 +1,28 @@
+<?php
+$file_location = base_path('vendor/crocodicstudio/crudbooster/src/views/default/type_components/'.$type.'/component_detail.blade.php');
+$user_location = resource_path('views/vendor/crudbooster/type_components/'.$type.'/component_detail.blade.php');
+?>
+
+@if(file_exists($file_location))
+    <?php $containTR = (substr(trim(file_get_contents($file_location)), 0, 4) == '<tr>') ? TRUE : FALSE;?>
+    @if($containTR)
+        @include('crudbooster::default.type_components.'.$type.'.component_detail')
+    @else
+        <tr>
+            <td>{{$label}}</td>
+            <td>@include('crudbooster::default.type_components.'.$type.'.component_detail')</td>
+        </tr>
+    @endif
+@elseif(file_exists($user_location))
+    <?php $containTR = (substr(trim(file_get_contents($user_location)), 0, 4) == '<tr>') ? TRUE : FALSE;?>
+    @if($containTR)
+        @include('vendor.crudbooster.type_components.'.$type.'.component_detail')
+    @else
+        <tr>
+            <td>{{$label}}</td>
+            <td>@include('vendor.crudbooster.type_components.'.$type.'.component_detail')</td>
+        </tr>
+    @endif
+@else
+    <!-- <tr><td colspan='2'>NO COMPONENT {{$type}}</td></tr> -->
+@endif
diff --git a/src/views/default/form_detail.blade.php b/src/views/default/form_detail.blade.php
@@ -49,38 +49,8 @@
         $disabled = $formInput['disabled'] ? "disabled" : "";
         $jquery = @$formInput['jquery'];
         $placeholder = "placeholder='{$formInput['placeholder']}'";
-
-
-
-        $file_location = base_path('vendor/crocodicstudio/crudbooster/src/views/default/type_components/'.$type.'/component_detail.blade.php');
-        $user_location = resource_path('views/vendor/crudbooster/type_components/'.$type.'/component_detail.blade.php');
-
-        ?>
-
-        @if(file_exists($file_location))
-            <?php $containTR = (substr(trim(file_get_contents($file_location)), 0, 4) == '<tr>') ? TRUE : FALSE;?>
-            @if($containTR)
-                @include('crudbooster::default.type_components.'.$type.'.component_detail')
-            @else
-                <tr>
-                    <td>{{$label}}</td>
-                    <td>@include('crudbooster::default.type_components.'.$type.'.component_detail')</td>
-                </tr>
-            @endif
-        @elseif(file_exists($user_location))
-            <?php $containTR = (substr(trim(file_get_contents($user_location)), 0, 4) == '<tr>') ? TRUE : FALSE;?>
-            @if($containTR)
-                @include('vendor.crudbooster.type_components.'.$type.'.component_detail')
-            @else
-                <tr>
-                    <td>{{$label}}</td>
-                    <td>@include('vendor.crudbooster.type_components.'.$type.'.component_detail')</td>
-                </tr>
-            @endif
-        @else
-        <!-- <tr><td colspan='2'>NO COMPONENT {{$type}}</td></tr> -->
-        @endif
-
+            ?>
+        @include('crudbooster::default._form_body.component_details')
 
         @endforeach
 

diff --git a/src/views/default/type_components/child/component.blade.php b/src/views/default/type_components/child/component.blade.php
@@ -39,7 +39,7 @@
                                                 @if($col['type']=='text')
                                                     <input id='{{$name_column}}'
                                                            type='text'
-                                                           {{ ($col['max'])?"maxlength='$col[max]'":"" }}
+                                                           {{ ($col['max'])?"maxlength='{$col['max']}'":"" }}
                                                            name='child-{{$col["name"]}}'
                                                            class='form-control {{$col['required']?"required":""}}'
                                                            {{($col['readonly']===true)?"readonly":""}}
@@ -50,7 +50,7 @@ class='form-control {{$col['required']?"required":""}}'
                                                     @include('crudbooster::default.type_components.child.partials.dataModal', ['name' => $name, 'col' => $col])
                                                 @elseif($col['type']=='number')
                                                     <input id='{{$name_column}}' type='number'
-                                                           {{ ($col['min'])?"min='$col[min]'":"" }} {{ ($col['max'])?"max='$col[max]'":"" }} name='child-{{$col["name"]}}'
+                                                           {{ ($col['min'])?"min='$col[min]'":"" }} {{ ($col['max'])?"max='{$col['max']}'":"" }} name='child-{{$col["name"]}}'
                                                            class='form-control {{$col['required']?"required":""}}'
                                                             {{($col['readonly']===true)?"readonly":""}}
                                                     />