fixes bug in image.blade.php (#27)

novius · Nov 3, 2017 · 4d08bc8 · 4d08bc8
1 parent 0bba298
commit 4d08bc8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/resources/views/form_content.blade.php b/resources/views/form_content.blade.php
@@ -47,9 +47,9 @@
                 <div class="box-body row">
                     {{-- See if we're using tabs --}}
                     @if ($crud->boxHasTabs($box))
-                        @include('crud::inc.show_tabbed_fields', ['box' => $box])
+                        @include('crud::inc.show_tabbed_fields', ['fields' => $fields, 'box' => $box])
                     @else
-                        @include('crud::inc.show_fields', ['fields' => $crud->getBoxFields($box)])
+                        @include('crud::inc.show_fields', ['fields' => $fields, 'boxFields' => $crud->getBoxFields($box)])
                     @endif
                 </div>
             </div>
@@ -66,7 +66,7 @@
                         </div>
                     </div>
                     <div class="box-body">
-                        @include('crud::inc.show_fields', ['fields' => $crud->getBoxFields($box)])
+                        @include('crud::inc.show_fields', ['fields' => $fields, 'boxFields' => $crud->getBoxFields($box)])
                     </div>
                 </div>
             @endforeach

diff --git a/resources/views/inc/show_fields.blade.php b/resources/views/inc/show_fields.blade.php
@@ -1,5 +1,5 @@
 {{-- Show the inputs --}}
-@foreach ($fields as $field)
+@foreach ($boxFields as $field)
     <!-- load the view from the application if it exists, otherwise load the one in the package -->
     @if(strpos($field['type'], '\\') !== false)
         @include((new $field['type'])->view(), array('field' => $field))

diff --git a/resources/views/inc/show_tabbed_fields.blade.php b/resources/views/inc/show_tabbed_fields.blade.php
@@ -38,7 +38,7 @@
     @foreach ($crud->getBoxTabs($box) as $k => $tab)
     <div role="tabpanel" class="tab-pane{{$k == 0 ? ' active' : ''}}" id="tab_{{ str_slug($tab, "") }}">
 
-        @include('crud::inc.show_fields', ['fields' => $crud->getBoxTabFields($box, $tab)])
+        @include('crud::inc.show_fields', ['fields' => $fields, 'boxFields' => $crud->getBoxTabFields($box, $tab)])
 
     </div>
     @endforeach